Add input files for all centralities

[u/mrichter/AliRoot.git] / TOF / AliTOFDigitizer.cxx

diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx
index 4b5bf0a213c0f3f2c533dd9198f9c9584c41c3bc..0f310678fa6ded3ffe3079d9f886fec05e5e717c 100644 (file)
--- a/TOF/AliTOFDigitizer.cxx
+++ b/TOF/AliTOFDigitizer.cxx
@@ -25,9 +25,9 @@
 //                                                                         //
 //_________________________________________________________________________//
 
-#include "Riostream.h"
+//#include "Riostream.h"
 
-#include "TFile.h"
+//#include "TFile.h"
 #include "TH1F.h"
 #include "TTree.h"
 #include "TRandom.h"
@@ -40,7 +40,7 @@
 #include "AliRun.h"
 
 #include "AliTOFcalib.h"
-#include "AliTOFChannelOnline.h"
+//#include "AliTOFChannelOnline.h"
 #include "AliTOFChannelOffline.h"
 #include "AliTOFDigitizer.h"
 #include "AliTOFdigit.h"
@@ -50,7 +50,7 @@
 #include "AliTOF.h"
 
 extern TDirectory *gDirectory;
-extern TFile *gFile;
+//extern TFile *gFile;
 extern TRandom *gRandom;
 
 extern AliRun *gAlice;
@@ -61,8 +61,8 @@ ClassImp(AliTOFDigitizer)
 //___________________________________________
   AliTOFDigitizer::AliTOFDigitizer()  :
     AliDigitizer(),
-    fDigits(0x0),
-    fSDigitsArray(0x0),
+    fDigits(new TClonesArray("AliTOFdigit",4000)),
+    fSDigitsArray(new TClonesArray("AliTOFSDigit",1000)),
   fhitMap(0x0),
   fCalib(new AliTOFcalib())
 {
@@ -73,8 +73,8 @@ ClassImp(AliTOFDigitizer)
 //___________________________________________
 AliTOFDigitizer::AliTOFDigitizer(AliRunDigitizer* manager): 
   AliDigitizer(manager), 
-  fDigits(0x0),
-  fSDigitsArray(0x0),
+  fDigits(new TClonesArray("AliTOFdigit",4000)),
+  fSDigitsArray(new TClonesArray("AliTOFSDigit",1000)),
   fhitMap(0x0),
   fCalib(new AliTOFcalib())
 {
@@ -97,10 +97,15 @@ AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source):
   AliTOFDigitizer& AliTOFDigitizer::operator=(const AliTOFDigitizer &source)
 {
   // ass. op.
-  this->fDigits=source.fDigits;
-  this->fSDigitsArray=source.fSDigitsArray;
-  this->fhitMap=source.fhitMap;
-  this->fCalib=source.fCalib;
+  
+  if (this == &source)
+    return *this;
+
+  AliDigitizer::operator=(source);
+  fDigits=source.fDigits;
+  fSDigitsArray=source.fSDigitsArray;
+  fhitMap=source.fhitMap;
+  fCalib=source.fCalib;
   return *this;
 
 }
@@ -110,6 +115,16 @@ AliTOFDigitizer::~AliTOFDigitizer()
 {
   // Destructor
   delete fCalib;
+  if (fDigits){
+    fDigits->Delete();
+    delete fDigits;
+    fDigits=0x0;
+  }
+  if (fSDigitsArray){
+    fSDigitsArray->Delete();
+    delete fSDigitsArray;
+    fSDigitsArray=0x0;
+  }
 }
 
 //---------------------------------------------------------------------
@@ -135,8 +150,6 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
   //Make branches
   char branchname[20];
   sprintf (branchname, "%s", tof->GetName ());
-
-  fDigits=new TClonesArray("AliTOFdigit",4000);
  
   AliRunLoader* outrl = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
   if (outrl == 0x0)
@@ -181,7 +194,7 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
   tof->MakeBranchInTree(treeD,branchname,&fDigits,4000);
 
   // container for all summed sdigits (to be created in Init())
-  fSDigitsArray=new TClonesArray("AliTOFSDigit",1000);
+  //fSDigitsArray=new TClonesArray("AliTOFSDigit",1000);
   
   // create hit map (to be created in Init())
   fhitMap = new AliTOFHitMap(fSDigitsArray);
@@ -198,15 +211,13 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
 
   // free used memory for Hit Map in current event
   delete fhitMap;
-  fSDigitsArray->Delete();
-  delete fSDigitsArray;
+  fSDigitsArray->Clear();
 
   treeD->Fill();
  
   outgime->WriteDigits("OVERWRITE");
   outgime->UnloadDigits();
-  fDigits->Delete();
-  delete fDigits;
+  fDigits->Clear();
 
 }
 
@@ -271,7 +282,9 @@ void AliTOFDigitizer::CreateDigits()
       
       Int_t tdc=tofsdigit->GetTdc(islot); digit[0]=tdc;
       Int_t adc=tofsdigit->GetAdc(islot); digit[1]=adc;
-      
+
+      //if (tdc>=8192) continue;//AdC
+
       tracknum[0]=tofsdigit->GetTrack(islot,0);
       tracknum[1]=tofsdigit->GetTrack(islot,1);
       tracknum[2]=tofsdigit->GetTrack(islot,2);
@@ -301,6 +314,10 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
   // SDigits from different files are assumed to
   // be created with the same simulation parameters.
   
+  // creating the TClonesArray to store the digits
+  static TClonesArray sdigitsClonesArray("AliTOFSDigit",  1000); 
+  sdigitsClonesArray.Clear();
+
   // get the treeS from manager
   AliRunLoader* rl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(inputFile));
   if (rl == 0x0)
@@ -333,8 +350,7 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
       }
    } 
   // get the branch TOF inside the treeS
-  TClonesArray * sdigitsDummyContainer= new TClonesArray("AliTOFSDigit",  1000); 
-
+  TClonesArray * sdigitsDummyContainer=&sdigitsClonesArray;
   // check if the branch exist
   TBranch* tofBranch=currentTreeS->GetBranch("TOF");
 
@@ -382,12 +398,9 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
       } // if (hitMap->TestHit(vol) != kEmpty)
       
     } // for (Int_t k=0; k<ndig; k++)
-    sdigitsDummyContainer->Delete();
 
   } // end loop on entries
 
-  delete sdigitsDummyContainer;
-
 }