fEnCalibData(0),
fTowCalibData(0),
fZDCCalibFName(""),
- fSpectatorTracked(1)
+ fSpectatorTracked(1),
+ fBeamEnergy(0.),
+ fIspASystem(kFALSE),
+ fIsRELDISgen(kFALSE),
+ fOnlyZEM(kFALSE),
+ fFindMother(kFALSE)
{
//
// Default constructor for the Zero Degree Calorimeter base class
//_____________________________________________________________________________
AliZDC::AliZDC(const char *name, const char *title) :
AliDetector(name,title),
- fNoShower (0),
+ fNoShower(0),
fPedCalib(0),
fEnCalibData(0),
fTowCalibData(0),
fZDCCalibFName(""),
- fSpectatorTracked(1)
+ fSpectatorTracked(1),
+ fBeamEnergy(0.),
+ fIspASystem(kFALSE),
+ fIsRELDISgen(kFALSE),
+ fOnlyZEM(kFALSE),
+ fFindMother(kFALSE)
{
//
// Standard constructor for the Zero Degree Calorimeter base class
fEnCalibData(ZDC.fEnCalibData),
fTowCalibData(ZDC.fTowCalibData),
fZDCCalibFName(ZDC.fZDCCalibFName),
-fSpectatorTracked(ZDC.fSpectatorTracked)
+fSpectatorTracked(ZDC.fSpectatorTracked),
+fBeamEnergy(ZDC.fBeamEnergy),
+fIspASystem(ZDC.fIspASystem),
+fIsRELDISgen(ZDC.fIsRELDISgen),
+fOnlyZEM(ZDC.fOnlyZEM),
+fFindMother(ZDC.fFindMother)
{
// copy constructor
}
fEnCalibData = ZDC.fEnCalibData;
fTowCalibData = ZDC.fTowCalibData;
fZDCCalibFName = ZDC.fZDCCalibFName;
+ fBeamEnergy = ZDC.fBeamEnergy;
+ fIspASystem = ZDC.fIspASystem;
+ fIsRELDISgen = ZDC.fIsRELDISgen;
+ fOnlyZEM = ZDC.fOnlyZEM;
+ fFindMother = ZDC.fFindMother;
} return *this;
}
//
// Add a ZDC hit to the hit list.
- static Float_t trackTime=0., primKinEn=0., xImpact=0., yImpact=0., sFlag=0.;
- static Int_t pcPDGcode, motPDGcode;
+ static Float_t trackTime=0., trackEta=0., primKinEn=0., xImpact=0., yImpact=0., sFlag=0.;
+ static Int_t pcPDGcode=0, motPDGcode=0;
AliZDCHit *newquad, *curprimquad;
newquad = new AliZDCHit(fIshunt, track, vol, 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){
}
else if(track == imo){
newquad->SetSFlag(0); // PRIMARY particle entering the ZDC
- }
+ }*/
//
sFlag = newquad->GetSFlag();
primKinEn = newquad->GetPrimKinEn();
pcPDGcode = newquad->GetPDGCode();
motPDGcode = newquad->GetMotherPDGCode();
trackTime = newquad->GetTrackTOF();
+ trackEta = newquad->GetTrackEta();
}
else{
newquad->SetPrimKinEn(primKinEn);
newquad->SetPDGCode(pcPDGcode);
newquad->SetMotherPDGCode(motPDGcode);
newquad->SetTrackTOF(trackTime);
+ newquad->SetTrackEta(trackEta);
}
Int_t j;
}
//_____________________________________________________________________________
-AliDigitizer* AliZDC::CreateDigitizer(AliRunDigitizer* manager) const
-{
+AliDigitizer* AliZDC::CreateDigitizer(AliDigitizationInput* digInput) const{
// Create the digitizer for ZDC
- AliZDCDigitizer *zdcDigitizer = new AliZDCDigitizer(manager);
+ AliZDCDigitizer *zdcDigitizer = new AliZDCDigitizer(digInput);
if(fSpectatorTracked==0) zdcDigitizer->SetSpectators2Track();
- //printf("\n**************************ZDC digitizer created with Spectators2Track = %d\n\n", fSpectatorTracked);
+ if(fBeamEnergy>0.01) zdcDigitizer->SetBeamEnergy(fBeamEnergy);
+ if(fIspASystem==kTRUE) zdcDigitizer->SetpAsystem();
+ if(fIsRELDISgen==kTRUE) zdcDigitizer->SetRELDISGenerator();
+ //if(fIspASystem==kTRUE) printf("\n **** ZDC digitizer initialized for p-A collisions\n\n");
return zdcDigitizer;
}
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;
}
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;
}
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;
}
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;