Destructor added in various classes. This should fix the problems of abnormal memory...

[u/mrichter/AliRoot.git] / ZDC / AliZDC.cxx

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 8d3b556021cd9c247d7ca527b898b558ab74fb01..73e2c4a5dc5203c42608e662d733bcc7822bc90f 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -63,7 +63,10 @@ AliZDC::AliZDC() :
   fEnCalibData(0),
   fTowCalibData(0),
   fZDCCalibFName(""),
-  fSpectatorTracked(1)
+  fSpectatorTracked(1),
+  fBeamEnergy(0.),
+  fIspASystem(kFALSE),
+  fIsRELDISgen(kFALSE)
 {
   //
   // Default constructor for the Zero Degree Calorimeter base class
@@ -85,7 +88,10 @@ AliZDC::AliZDC(const char *name, const char *title) :
   fEnCalibData(0),
   fTowCalibData(0),
   fZDCCalibFName(""),
-  fSpectatorTracked(1)
+  fSpectatorTracked(1),
+  fBeamEnergy(0.),
+  fIspASystem(kFALSE),
+  fIsRELDISgen(kFALSE)
 {
   //
   // Standard constructor for the Zero Degree Calorimeter base class
@@ -125,7 +131,10 @@ fPedCalib(ZDC.fPedCalib),
 fEnCalibData(ZDC.fEnCalibData),
 fTowCalibData(ZDC.fTowCalibData),
 fZDCCalibFName(ZDC.fZDCCalibFName),
-fSpectatorTracked(ZDC.fSpectatorTracked)
+fSpectatorTracked(ZDC.fSpectatorTracked),
+fBeamEnergy(ZDC.fBeamEnergy),
+fIspASystem(ZDC.fIspASystem),
+fIsRELDISgen(ZDC.fIsRELDISgen)
 {
   // copy constructor
 }
@@ -140,6 +149,8 @@ AliZDC& AliZDC::operator=(const AliZDC& ZDC)
     fEnCalibData = ZDC.fEnCalibData;
     fTowCalibData = ZDC.fTowCalibData;
     fZDCCalibFName = ZDC.fZDCCalibFName;
+    fBeamEnergy = ZDC.fBeamEnergy;
+    fIspASystem = ZDC.fIspASystem;
   } return *this;
 }
 
@@ -408,12 +419,14 @@ void AliZDC::Hits2SDigits()
 }
 
 //_____________________________________________________________________________
-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;
 }