Merge branch 'master' of https://git.cern.ch/reps/AliRoot

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 662ace916566ae05374954c8a7fa656b9e433142..04db5472a9706671bc273aa1d264f58d959e111c 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -66,7 +66,8 @@ AliZDC::AliZDC() :
   fSpectatorTracked(1),
   fBeamEnergy(0.),
   fIspASystem(kFALSE),
-  fIsRELDISgen(kFALSE)
+  fIsRELDISgen(kFALSE),
+  fOnlyZEM(kFALSE)
 {
   //
   // Default constructor for the Zero Degree Calorimeter base class
@@ -83,7 +84,7 @@ AliZDC::AliZDC() :
 //_____________________________________________________________________________
 AliZDC::AliZDC(const char *name, const char *title) : 
   AliDetector(name,title),
-  fNoShower  (0),
+  fNoShower(0),
   fPedCalib(0),
   fEnCalibData(0),
   fTowCalibData(0),
@@ -91,7 +92,8 @@ AliZDC::AliZDC(const char *name, const char *title) :
   fSpectatorTracked(1),
   fBeamEnergy(0.),
   fIspASystem(kFALSE),
-  fIsRELDISgen(kFALSE)
+  fIsRELDISgen(kFALSE),
+  fOnlyZEM(kFALSE)
 {
   //
   // Standard constructor for the Zero Degree Calorimeter base class
@@ -134,7 +136,8 @@ fZDCCalibFName(ZDC.fZDCCalibFName),
 fSpectatorTracked(ZDC.fSpectatorTracked),
 fBeamEnergy(ZDC.fBeamEnergy),
 fIspASystem(ZDC.fIspASystem),
-fIsRELDISgen(ZDC.fIsRELDISgen)
+fIsRELDISgen(ZDC.fIsRELDISgen),
+fOnlyZEM(ZDC.fOnlyZEM)
 {
   // copy constructor
 }
@@ -151,6 +154,8 @@ AliZDC& AliZDC::operator=(const AliZDC& ZDC)
     fZDCCalibFName = ZDC.fZDCCalibFName;
     fBeamEnergy = ZDC.fBeamEnergy;
     fIspASystem = ZDC.fIspASystem;
+    fIsRELDISgen = ZDC.fIsRELDISgen;
+    fOnlyZEM = ZDC.fOnlyZEM;
   } return *this;
 }
 
@@ -161,7 +166,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   //           Add a ZDC hit to the hit list.
   
   static Float_t trackTime=0., trackEta=0., primKinEn=0., xImpact=0., yImpact=0., sFlag=0.;
-  static Int_t   pcPDGcode, motPDGcode;
+  static Int_t   pcPDGcode=0, motPDGcode=0;
 
   AliZDCHit *newquad, *curprimquad;
   newquad = new AliZDCHit(fIshunt, track, vol, hits);
@@ -169,7 +174,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   
   if(fNhits==0){
       // First hit -> setting flag for primary or secondary particle
-      TParticle * p = gAlice->GetMCApp()->Particle(track);
+      /*TParticle * p = gAlice->GetMCApp()->Particle(track);
       Int_t imo = p->GetFirstMother();
       //
       if(track != imo){
@@ -177,7 +182,7 @@ void AliZDC::AddHit(Int_t track, Int_t *vol, Float_t *hits)
       }
       else if(track == imo){
         newquad->SetSFlag(0);  // PRIMARY particle entering the ZDC
-      }
+      }*/
       //  
       sFlag     = newquad->GetSFlag();
       primKinEn  = newquad->GetPrimKinEn();
@@ -555,7 +560,7 @@ void AliZDC::Digits2Raw()
      
     if(lADCDataGEO==0){ 
       if(indADC0>=knADCData1){
-        AliWarning(" Problem with digit index 4 ADC0\n");
+        AliWarning(Form(" Problem with digit index %d for ADC0\n", indADC0));
        return;
       }
       Int_t indLG = indADC0+knADCData1;
@@ -577,7 +582,7 @@ void AliZDC::Digits2Raw()
     }
     else if(lADCDataGEO==1){ 
       if(indADC1>=knADCData2){
-         AliWarning(" Problem with digit index 4 ADC1\n");
+         AliWarning(Form(" Problem with digit index %d for ADC1\n", indADC1));
         return;
       }
       Int_t indLG = indADC1+knADCData2;
@@ -599,7 +604,7 @@ void AliZDC::Digits2Raw()
     }
     else if(lADCDataGEO==2){ 
       if(indADC2>=knADCData3){
-        AliWarning(" Problem with digit index 4 ADC2\n");
+        AliWarning(Form(" Problem with digit index %d for ADC2\n", indADC2));
        return;
       }
       Int_t indLG = indADC2+knADCData3;
@@ -621,7 +626,7 @@ void AliZDC::Digits2Raw()
     }
     else if(lADCDataGEO==3){ 
       if(indADC3>=knADCData4){
-         AliWarning(" Problem with digit index 4 ADC2\n");
+         AliWarning(Form(" Problem with digit index %d for ADC2\n", indADC3));
         return;
       }
       Int_t indLG = indADC3+knADCData4;

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 0bd95122e0ae2a293c3e4e5b03e2b1567bbecf9b..a21dec5a4eae3b1b1f13cd7f0d23e3f6809cfebf 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -87,6 +87,8 @@ public:
   void  SetBeamEnergy(Float_t beamEnergy) {fBeamEnergy = beamEnergy;}
   void  SetpAsystem() {fIspASystem = kTRUE;}
   void  SetRELDISGenerator() {fIsRELDISgen = kTRUE;}
+  
+  void  SetOnlyZEM() {fOnlyZEM=kTRUE;}
 
 private:
 
@@ -108,7 +110,9 @@ protected:
   Bool_t  fIspASystem;       // Configuring pA collisions (MC only)
   Bool_t  fIsRELDISgen;             // Is RELDIS used as generator
   
-  ClassDef(AliZDC,12)          // Zero Degree Calorimeter base class
+  Bool_t fOnlyZEM;          // build only ZEM (no had. calorimeters!)
+  
+  ClassDef(AliZDC,13)          // Zero Degree Calorimeter base class
 };
  
 // Calibration

diff --git a/ZDC/AliZDCHit.cxx b/ZDC/AliZDCHit.cxx
index ae07219027a9832ffd6914f6259311d2b5a87021..e641968b9123d18dee70ab59ec061fb87bf6202d 100644 (file)
--- a/ZDC/AliZDCHit.cxx
+++ b/ZDC/AliZDCHit.cxx
@@ -39,7 +39,6 @@ AliZDCHit::AliZDCHit() :
   fMotherPDGCode(0),
   fTrackTOF(0.),
   fTrackEta(0.)
-
 {
   //
   // Default constructor
@@ -126,10 +125,10 @@ AliZDCHit &AliZDCHit::operator= (const AliZDCHit &hit)
 void AliZDCHit::Print(Option_t *) const 
 {
    // Print method
-   printf("\t AliZDCHit: track %d eta %f PDGcode %d TOF %1.1f ns E_prim = %1.2f GeV \n" 
-         "\t DETECTOR (%d, %d)  (X, Y)_impact (%f, %f) cm\n"
+   printf("\t **** AliZDCHit: track %d eta %f PDGcode %d TOF %1.1f ns E_prim = %1.2f GeV \n" 
+         "\t DETECTOR (%d, %d)  (X, Y)_impact (%1.2f, %1.2f) cm  Secflag %1.0f\n"
           "\t PMQLight %1.0f, PMCLight %1.0f,  E_dep %1.2f\n ", 
           fTrack,fTrackEta,fPDGCode,fTrackTOF,fPrimKinEn,
-         fVolume[0],fVolume[1],fXImpact,fYImpact,
+         fVolume[0],fVolume[1],fXImpact,fYImpact,fSFlag,
           fLightPMQ,fLightPMC,fEnergy);
 }

diff --git a/ZDC/AliZDCv4.cxx b/ZDC/AliZDCv4.cxx
index 7ffa1b23a428f6b97333b0455e6e569d707d903d..e04ec5ce784ccda3ea1dab7ffb8715f352c70162 100644 (file)
--- a/ZDC/AliZDCv4.cxx
+++ b/ZDC/AliZDCv4.cxx
@@ -46,6 +46,7 @@
 #include "AliRun.h"
 #include "AliZDCv4.h"
 #include "AliMC.h"
+#include "AliMCParticle.h"
  
 class  AliZDCHit;
 class  AliPDG;
@@ -229,6 +230,7 @@ void AliZDCv4::CreateBeamLine()
   //
   // Create the beam line elements
   //
+  if(fOnlyZEM) printf("\n  Only ZEM configuration requested: no side-C beam pipe, no side-A hadronic ZDCs\n\n");
   
   Double_t zd1, zd2, zCorrDip, zInnTrip, zD1;
   Double_t conpar[9], tubpar[3], tubspar[5], boxpar[3];
@@ -238,16 +240,21 @@ void AliZDCv4::CreateBeamLine()
   gMC->Matrix(irotpipe1,90.-1.0027,0.,90.,90.,1.0027,180.);      
   gMC->Matrix(irotpipe2,90.+1.0027,0.,90.,90.,1.0027,0.);
 
-  //
   Int_t *idtmed = fIdtmed->GetArray();
+  Double_t dx=0., dy=0., dz=0.;
+  Double_t thx=0., thy=0., thz=0.;
+  Double_t phx=0., phy=0., phz=0.;
   
+  TGeoMedium *medZDCFe = gGeoManager->GetMedium("ZDC_ZIRONT");
+  TGeoMedium *medZDCvoid = gGeoManager->GetMedium("ZDC_ZVOID");
+    
   ////////////////////////////////////////////////////////////////
   //                                                           //
   //                SIDE C - RB26 (dimuon side)                        //
   //                                                           //
-  ///////////////////////////////////////////////////////////////
-  
+  ////////////////////////////////////////////////////////////////
   
+if(!fOnlyZEM){  
   // -- Mother of the ZDCs (Vacuum PCON)
   zd1 = 1921.6;
   
@@ -579,13 +586,13 @@ void AliZDCv4::CreateBeamLine()
   // --------------------------------------------------------
   // TRANSFORMATION MATRICES
   // Combi transformation: 
-  Double_t dx = -3.970000;
-  Double_t dy = 0.000000;
-  Double_t dz = 0.0;
+  dx = -3.970000;
+  dy = 0.000000;
+  dz = 0.0;
   // Rotation: 
-  Double_t thx = 84.989100;   Double_t phx = 180.000000;
-  Double_t thy = 90.000000;   Double_t phy = 90.000000;
-  Double_t thz = 185.010900;  Double_t phz = 0.000000;
+  thx = 84.989100;   phx = 180.000000;
+  thy = 90.000000;   phy = 90.000000;
+  thz = 185.010900;  phz = 0.000000;
   TGeoRotation *rotMatrix1c = new TGeoRotation("c",thx,phx,thy,phy,thz,phz);
   // Combi transformation: 
   dx = -3.970000;
@@ -627,7 +634,6 @@ void AliZDCv4::CreateBeamLine()
   TGeoCompositeShape *pOutTrousersC = new TGeoCompositeShape("outTrousersC", "QCLext:ZDCC_c1+QCLext:ZDCC_c2");
   
   // Volume: QCLext
-  TGeoMedium *medZDCFe = gGeoManager->GetMedium("ZDC_ZIRONT");
   TGeoVolume *pQCLext = new TGeoVolume("QCLext",pOutTrousersC, medZDCFe);
   pQCLext->SetLineColor(kGreen);
   pQCLext->SetVisLeaves(kTRUE);
@@ -639,7 +645,6 @@ void AliZDCv4::CreateBeamLine()
   // Inner trousers
   TGeoCompositeShape *pIntTrousersC = new TGeoCompositeShape("intTrousersC", "QCLint:ZDCC_c1+QCLint:ZDCC_c2");
   // Volume: QCLint
-  TGeoMedium *medZDCvoid = gGeoManager->GetMedium("ZDC_ZVOID");
   TGeoVolume *pQCLint = new TGeoVolume("QCLint",pIntTrousersC, medZDCvoid);
   pQCLint->SetLineColor(kTeal);
   pQCLint->SetVisLeaves(kTRUE);
@@ -696,7 +701,7 @@ void AliZDCv4::CreateBeamLine()
     gMC->Gspos("QLUC", 1, "ZDCC", 0., 0.,  fPosZNC[2]+66.+boxpar[2], 0, "ONLY");
     printf("   C SIDE LUMINOMETER %1.2f < z < %1.2f\n",  fPosZNC[2]+66., fPosZNC[2]+66.+2*boxpar[2]);
   }
-                
+}               
   // --  END OF BEAM PIPE VOLUME DEFINITION FOR SIDE C (RB26 SIDE) 
   // ----------------------------------------------------------------
 
@@ -1724,6 +1729,16 @@ void AliZDCv4::CreateZDC()
   
   Int_t *idtmed = fIdtmed->GetArray();
 
+  // Parameters for EM calorimeter geometry
+  // NB -> parameters used ONLY in CreateZDC()
+  Float_t kDimZEMPb  = 0.15*(TMath::Sqrt(2.));  // z-dimension of the Pb slice
+  Float_t kFibRadZEM = 0.0315;                         // External fiber radius (including cladding)
+  Int_t   fDivZEM[3] = {92, 0, 20};            // Divisions for EM detector
+  Float_t fDimZEM[6] = {fZEMLength, 3.5, 3.5, 45., 0., 0.}; // Dimensions of EM detector
+  Float_t fFibZEM2 = fDimZEM[2]/TMath::Sin(fDimZEM[3]*kDegrad)-kFibRadZEM;
+  Float_t fFibZEM[3] = {0., 0.0275, fFibZEM2};  // Fibers for EM calorimeter
+
+if(!fOnlyZEM){
   // Parameters for hadronic calorimeters geometry
   // NB -> parameters used ONLY in CreateZDC()
   Float_t fGrvZN[3] = {0.03, 0.03, 50.};  // Grooves for neutron detector
@@ -1733,14 +1748,6 @@ void AliZDCv4::CreateZDC()
   Int_t   fTowZN[2] = {2, 2};                    // Tower for neutron detector
   Int_t   fTowZP[2] = {4, 1};                    // Tower for proton detector
 
-  // Parameters for EM calorimeter geometry
-  // NB -> parameters used ONLY in CreateZDC()
-  Float_t kDimZEMPb  = 0.15*(TMath::Sqrt(2.));  // z-dimension of the Pb slice
-  Float_t kFibRadZEM = 0.0315;                         // External fiber radius (including cladding)
-  Int_t   fDivZEM[3] = {92, 0, 20};            // Divisions for EM detector
-  Float_t fDimZEM[6] = {fZEMLength, 3.5, 3.5, 45., 0., 0.}; // Dimensions of EM detector
-  Float_t fFibZEM2 = fDimZEM[2]/TMath::Sin(fDimZEM[3]*kDegrad)-kFibRadZEM;
-  Float_t fFibZEM[3] = {0., 0.0275, fFibZEM2};  // Fibers for EM calorimeter
 
   
   //-- Create calorimeters geometry
@@ -1855,7 +1862,7 @@ void AliZDCv4::CreateZDC()
   gMC->Gspos("ZPRO", 2, "ZDCA", fPosZPA[0], fPosZPA[1], fPosZPA[2]+fDimZP[2], 0, "ONLY");
   //Ch debug
   //printf("\n ZP left -> %f < z < %f cm\n",fPosZPl[2],fPosZPl[2]+2*fDimZP[2]);  
-    
+}    
   
   // -------------------------------------------------------------------------------
   // -> EM calorimeter (ZEM)  
@@ -2069,6 +2076,8 @@ void AliZDCv4::AddAlignableVolumes() const
  // name with the corresponding volume path. Needs to be syncronized with
  // eventual changes in the geometry.
  //
+ if(fOnlyZEM) return;
+ 
  TString volpath1 = "ALIC_1/ZDCC_1/ZNEU_1";
  TString volpath2 = "ALIC_1/ZDCC_1/ZPRO_1";
  TString volpath3 = "ALIC_1/ZDCA_1/ZNEU_2";
@@ -2303,7 +2312,7 @@ void AliZDCv4::StepManager()
       //printf("\t Particle: mass = %1.3f, E = %1.3f GeV, pz = %1.2f GeV -> stopped in volume %s\n", 
       //     gMC->TrackMass(), p[3], p[2], gMC->CurrentVolName());
       //
-      if(ipr!=0){
+      /*if(ipr!=0){
         printf("\n\t **********************************\n");
         printf("\t ********** Side C **********\n");
         printf("\t # of particles in IT = %d\n",fpLostITC);
@@ -2315,7 +2324,7 @@ void AliZDCv4::StepManager()
         printf("\t # of particles in TDI = %d\n",fpLostTDI);
         printf("\t # of particles in VColl = %d\n",fpcVCollA);
         printf("\t **********************************\n");
-      }
+      }*/
       gMC->StopTrack();
       return;
   }
@@ -2447,7 +2456,6 @@ void AliZDCv4::StepManager()
         hits[4] = xdet[0];
       }
       hits[5] = xdet[1];
-      hits[6] = 0;
       hits[7] = 0;
       hits[8] = 0;
       hits[9] = 0;
@@ -2455,19 +2463,35 @@ void AliZDCv4::StepManager()
       Int_t curTrackN = gAlice->GetMCApp()->GetCurrentTrackNumber();
       TParticle *part = gAlice->GetMCApp()->Particle(curTrackN);
       hits[10] = part->GetPdgCode();
-      //if(part->GetPdgCode()>10000) printf("\t PDGCode = %d\n", part->GetPdgCode());
       //
       Int_t imo = part->GetFirstMother();
-      if(imo>0){
-       TParticle *pmot = gAlice->GetMCApp()->Particle(imo);
-       hits[11] = pmot->GetPdgCode();
-        hits[13] = pmot->Eta();
+      //printf(" tracks: pc %d -> mother %d \n", curTrackN,imo); 
+      
+      int trmo = imo;
+      TParticle *pmot = 0x0;
+      Bool_t isChild = kFALSE;
+      if(imo>-1){
+        pmot = gAlice->GetMCApp()->Particle(imo);
+       trmo = pmot->GetFirstMother();
+       isChild = kTRUE;
+        while(trmo!=-1){
+          pmot = gAlice->GetMCApp()->Particle(trmo);
+           //printf("  **** pc %d -> mother %d \n", trch,trmo); 
+          trmo = pmot->GetFirstMother();
+       }
+      }
+      
+      if(isChild && pmot){
+          hits[6]  = 1;
+         hits[11] = pmot->GetPdgCode();
+         hits[13] = pmot->Eta();
       }
       else{
-        hits[11] = 0;
+        hits[6] = 0;
+       hits[11] = 0;
         hits[13] = part->Eta();
       }
-      //
+      
       hits[12] = 1.0e09*gMC->TrackTime(); // in ns!
 
       AddHit(curTrackN, vol, hits);
@@ -2475,19 +2499,20 @@ void AliZDCv4::StepManager()
       if(fNoShower==1){
         if(vol[0]==1){
           fnDetectedC += 1;
-          if(fnDetectedC==1) printf("  ### Particle in ZNC\n\n");
+          //if(fnDetectedC==1) printf("        ### Particle in ZNC\n\n");
         }
         else if(vol[0]==2){
           fpDetectedC += 1;
-          if(fpDetectedC==1) printf("  ### Particle in ZPC\n\n");
+          //if(fpDetectedC==1) printf("        ### Particle in ZPC\n\n");
         }
+        //else if(vol[0]==3) printf("  ### Particle in ZEM\n\n");        
         else if(vol[0]==4){
           fnDetectedA += 1;
-          if(fnDetectedA==1) printf("  ### Particle in ZNA\n\n");        
+          //if(fnDetectedA==1) printf("        ### Particle in ZNA\n\n");        
         }
         else if(vol[0]==5){
           fpDetectedA += 1;
-          if(fpDetectedA==1) printf("  ### Particle in ZPA\n\n");       
+          //if(fpDetectedA==1) printf("        ### Particle in ZPA\n\n");       
         }
        //
         //printf("\t Pc: x %1.2f y %1.2f z %1.2f  E %1.2f GeV pz = %1.2f GeV in volume %s\n", 

diff --git a/ZDC/AliZDCv4.h b/ZDC/AliZDCv4.h
index 879905efcdaf64e74f074d1ba90ed591c0cd72eb..97104023aabe0f52c4a94a266acb8979bc6407d9 100644 (file)
--- a/ZDC/AliZDCv4.h
+++ b/ZDC/AliZDCv4.h
@@ -117,9 +117,9 @@ protected:
   Float_t fTDIAperturePos;       // TDI semi-aperture pos. y dir.
   Float_t fTDIApertureNeg;       // TDI semi-aperture  neg. y dir. (abs. value)
   
-  Float_t fLumiLength;  // Luminometer length
+  Float_t fLumiLength;           // Luminometer length
   
-  ClassDef(AliZDCv4,1)  // Zero Degree Calorimeter version 1
+  ClassDef(AliZDCv4, 1)  // Zero Degree Calorimeter version 1
 }; 
  
 #endif