Code cleanup in AliITSDetTypeRec and vertexers + minor bug fix in AliITSVertexer3D...

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

diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx
index a473206546734bb3674af2fbfc5eedcd7cdc90eb..d5c64154e613bd6a6db5592b4e1264756b76769f 100644 (file)
--- a/ZDC/AliZDCDigitizer.cxx
+++ b/ZDC/AliZDCDigitizer.cxx
@@ -46,7 +46,6 @@
 class AliCDBStorage;
 class AliZDCPedestals;
 class AliZDCCalib;
-class AliZDCRecParam;
 
 ClassImp(AliZDCDigitizer)
 
@@ -55,8 +54,7 @@ ClassImp(AliZDCDigitizer)
 AliZDCDigitizer::AliZDCDigitizer() :
   fIsCalibration(0), 
   fPedData(0), 
-  fCalibData(0),
-  fRecParam(0)
+  fCalibData(0)
 {
 // Default constructor    
 
@@ -67,8 +65,7 @@ AliZDCDigitizer::AliZDCDigitizer(AliRunDigitizer* manager):
   AliDigitizer(manager),
   fIsCalibration(0), //By default the simulation doesn't create calib. data
   fPedData(GetPedData()), 
-  fCalibData(GetCalibData()),
-  fRecParam(GetRecParam())
+  fCalibData(GetCalibData())
 {
   // Get calibration data
   if(fIsCalibration!=0) printf("\n\t AliZDCDigitizer -> Creating calibration data (pedestals)\n");
@@ -88,8 +85,7 @@ AliZDCDigitizer::AliZDCDigitizer(const AliZDCDigitizer &digitizer):
   AliDigitizer(),
   fIsCalibration(digitizer.fIsCalibration),
   fPedData(digitizer.fPedData),
-  fCalibData(digitizer.fCalibData),
-  fRecParam(digitizer.fRecParam)
+  fCalibData(digitizer.fCalibData)
 {
   // Copy constructor
 
@@ -197,7 +193,7 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/)
 
     // get the impact parameter and the number of spectators in case of hijing
     if(!runLoader->GetAliRun()) runLoader->LoadgAlice();
-    AliHeader* header = runLoader->GetAliRun()->GetHeader();
+    AliHeader* header = runLoader->GetHeader();
     if(!header) continue;
     AliGenEventHeader* genHeader = header->GenEventHeader();
     if(!genHeader) continue;
@@ -324,21 +320,16 @@ void AliZDCDigitizer::Fragmentation(Float_t impPar, Int_t specN, Int_t specP,
 {
 // simulate fragmentation of spectators
 
-  Int_t zz[100], nn[100];
   AliZDCFragment frag(impPar);
-  for(Int_t j=0; j<=99; j++){
-     zz[j] =0;
-     nn[j] =0;
-  }
 
   // Fragments generation
-  Int_t nAlpha;
-  frag.GenerateIMF(zz, nAlpha);
+  frag.GenerateIMF();
+  Int_t nAlpha = frag.GetNalpha();
 
   // Attach neutrons
-  Int_t ztot=0;
-  Int_t ntot=0;
-  frag.AttachNeutrons(zz, nn, ztot, ntot);
+  Int_t ztot = frag.GetZtot();
+  Int_t ntot = frag.GetNtot();
+  frag.AttachNeutrons();
   freeSpecN = specN-ntot-2*nAlpha;
   freeSpecP = specP-ztot-2*nAlpha;
   // Removing deuterons
@@ -514,7 +505,7 @@ AliZDCCalib* AliZDCDigitizer::GetCalibData() const
 
   // Getting calibration object for ZDC set
 
-  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/Calib");
+  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/EMDCalib");
   if(!entry) AliFatal("No calibration data loaded!");  
 
   AliZDCCalib *calibdata = dynamic_cast<AliZDCCalib*>  (entry->GetObject());
@@ -522,19 +513,3 @@ AliZDCCalib* AliZDCDigitizer::GetCalibData() const
 
   return calibdata;
 }
-
-//_____________________________________________________________________________
-AliZDCRecParam* AliZDCDigitizer::GetRecParam() const
-{
-
-  // Getting calibration object for ZDC set
-
-  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/RecParam");
-  if(!entry) AliFatal("No calibration data loaded!");  
-
-  AliZDCRecParam *calibdata = dynamic_cast<AliZDCRecParam*>  (entry->GetObject());
-  if(!calibdata)  AliFatal("Wrong calibration object in calibration  file!");
-
-  return calibdata;
-}
-