* Fixing Barrel analysis

NPLib/Tiara/TTiaraBarrelPhysics.cxx

@@ -71,11 +71,10 @@ void TTiaraBarrelPhysics::BuildPhysicalEvent(){
 
   unsigned int sizeU = m_PreTreatedData->GetFrontUpstreamEMult();
   unsigned int sizeD = m_PreTreatedData->GetFrontDownstreamEMult();
-  unsigned int sizeB = m_EventData->GetBackEMult(); 
+  unsigned int sizeB = m_PreTreatedData->GetBackEMult(); 
  for(unsigned int k = 0 ; k < sizeB ; k++){
   for(unsigned int i = 0 ; i < sizeU ; i++){  
     if(m_PreTreatedData->GetFrontUpstreamEDetectorNbr(i) == m_PreTreatedData->GetBackEDetectorNbr(k))
-    
     for(unsigned int j = 0 ; j < sizeD ; j++){  
         // same detector, same strip
         if( m_PreTreatedData->GetFrontUpstreamEDetectorNbr(i) 
@@ -93,18 +92,18 @@ void TTiaraBarrelPhysics::BuildPhysicalEvent(){
              double POS =
                 CalibrationManager::getInstance()
                   ->ApplyResistivePositionCalibration("TIARABARREL/B"
-                    +itoa(m_EventData->GetFrontUpstreamEDetectorNbr(i))
-                    +"_STRIP"+itoa(m_EventData->GetFrontUpstreamEStripNbr(i))
+                    +itoa(m_PreTreatedData->GetFrontUpstreamEDetectorNbr(i))
+                    +"_STRIP"+itoa(m_PreTreatedData->GetFrontUpstreamEStripNbr(i))
                     +"_POS",(ED-EU)/(EU+ED));
                 
                 Strip_Pos.push_back(POS); 
-                Strip_N.push_back(m_EventData->GetFrontUpstreamEStripNbr(i));
-                DetectorNumber.push_back(m_EventData->GetFrontUpstreamEDetectorNbr(i));
+                Strip_N.push_back(m_PreTreatedData->GetFrontUpstreamEStripNbr(i));
+                DetectorNumber.push_back(m_PreTreatedData->GetFrontUpstreamEDetectorNbr(i));
                 double E = (EU+ED) / CalibrationManager::getInstance()
                   ->ApplyCalibration("TIARABARREL/BALLISTIC_B" 
-                  + itoa(m_EventData->GetFrontDownstreamEDetectorNbr(i)) 
+                  + itoa(m_PreTreatedData->GetFrontDownstreamEDetectorNbr(i)) 
                   + "_STRIP" 
-                  + itoa(m_EventData->GetFrontDownstreamEStripNbr(i)),
+                  + itoa(m_PreTreatedData->GetFrontDownstreamEStripNbr(i)),
                   POS);
                   Strip_E.push_back(E);
           }

NPSimulation/Makefile

@@ -4,15 +4,14 @@ NPSIM		= NPSimulation
 
 all:	$(DELFILES) $(COPYFILES) $(NPSIM)
 
-
-CopyIncSrcFiles:
-	./scripts/copyfiles.sh
-
 DelIncSrcFiles:
 	./scripts/deletefiles.sh
 
-NPSimulation:
-	make -j 10 -f Makefile.geant4
+CopyIncSrcFiles: DelIncSrcFiles
+	./scripts/copyfiles.sh
+
+NPSimulation: DelIncSrcFiles CopyIncSrcFiles
+	make -f Makefile.geant4
 
 clean:
 	./scripts/deletefiles.sh

NPSimulation/scripts/copyfiles.sh

@@ -42,7 +42,7 @@ do
       # only copy files associated to defined detector libraries
       if echo "$detectorlibs" | grep -q "$ldir" ; then
          # print informations
-         echo " + Copying files from $ldir directory..."
+         # echo " + Copying files from $ldir directory..."
          # enter directory
          cd $dir
          # loop on files in directory

NPSimulation/src/DetectorConstruction.cc

@@ -139,23 +139,20 @@ DetectorConstruction::~DetectorConstruction(){
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 G4VPhysicalVolume* DetectorConstruction::Construct(){
   //------------------------------------------------------ materials
-  
   G4double a;  // atomic mass
   G4double z;  // atomic number
   G4double density;
   
-  
   G4Element* N = new G4Element("Nitrogen", "N", z = 7., a = 14.01 * g / mole);
   G4Element* O = new G4Element("Oxygen"  , "O", z = 8., a = 16.00 * g / mole);
   
   //  Vacuum
   density = 0.000000001 * mg / cm3;
   G4Material* Vacuum = new G4Material("Vacuum", density, 2);
-  Vacuum->AddElement(N, .7);
-  Vacuum->AddElement(O, .3);
+  Vacuum->AddElement(N,.7);
+  Vacuum->AddElement(O,.3);
   
   //------------------------------world volume
-  
   G4double world_x = 10.0 * m;
   G4double world_y = 10.0 * m;
   G4double world_z = 10.0 * m;
@@ -164,10 +161,9 @@ G4VPhysicalVolume* DetectorConstruction::Construct(){
   = new G4Box("world_box", world_x, world_y, world_z);
   
   world_log = new G4LogicalVolume(world_box, Vacuum, "world_log", 0, 0, 0);
-  
   world_phys = new G4PVPlacement(0, G4ThreeVector(), world_log, "world", 0, false, 0);
   
-  //   G4VisAttributes* VisAtt = new G4VisAttributes(G4Colour(0.2, 0.2, 0.2));
+  //G4VisAttributes* VisAtt = new G4VisAttributes(G4Colour(0.2, 0.2, 0.2));
   G4VisAttributes* VisAtt = new G4VisAttributes(G4VisAttributes::Invisible);
   world_log->SetVisAttributes(VisAtt);