Removing the tasks from the digitization (Ruben)

sevdokim · Oct 23, 2011 · 2a69928 · 2a69928
1 parent 61d4455
commit 2a69928
Show file tree

Hide file tree

Showing 122 changed files with 829 additions and 1,908 deletions.
diff --git a/ACORDE/AliACORDE.cxx b/ACORDE/AliACORDE.cxx
@@ -234,11 +234,11 @@ AliLoader* AliACORDE::MakeLoader(const char* topfoldername)
 }
 
 
-AliDigitizer* AliACORDE::CreateDigitizer(AliRunDigitizer* manager) const
+AliDigitizer* AliACORDE::CreateDigitizer(AliDigitizationInput* digInput) const
 {
   //
   //
-  return new AliACORDEDigitizer(manager);
+  return new AliACORDEDigitizer(digInput);
 }
 
 void AliACORDE::Digits2Raw()

diff --git a/ACORDE/AliACORDE.h b/ACORDE/AliACORDE.h
@@ -33,7 +33,7 @@ class AliACORDE : public AliDetector {
 
   virtual AliLoader* MakeLoader(const char* topfoldername);
 
-  AliDigitizer*  CreateDigitizer(AliRunDigitizer* manager) const;
+  AliDigitizer*  CreateDigitizer(AliDigitizationInput* digInput) const;
 
   virtual AliTriggerDetector* CreateTriggerDetector() const
   { return new AliACORDETrigger(); }

diff --git a/ACORDE/AliACORDEDigitizer.cxx b/ACORDE/AliACORDEDigitizer.cxx
@@ -34,7 +34,7 @@
 #include "AliACORDEhit.h"
 #include "AliRunLoader.h"
 #include "AliLoader.h"
-#include "AliRunDigitizer.h"
+#include "AliDigitizationInput.h"
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
 #include "AliCDBEntry.h"
@@ -56,8 +56,8 @@ AliACORDEDigitizer::AliACORDEDigitizer()
   // default constructor
 }
 
-AliACORDEDigitizer::AliACORDEDigitizer(AliRunDigitizer* manager)
-  :AliDigitizer(manager),
+AliACORDEDigitizer::AliACORDEDigitizer(AliDigitizationInput* digInput)
+  :AliDigitizer(digInput),
    fCalibData(GetCalibData()),
    fNdigits(0),
    fDigits(0)
@@ -89,7 +89,7 @@ Bool_t AliACORDEDigitizer::Init()
   return kTRUE;
 }
 
-void AliACORDEDigitizer::Exec(Option_t* /*option*/)
+void AliACORDEDigitizer::Digitize(Option_t* /*option*/)
 {
 
   // Creates digits from hits
@@ -128,7 +128,7 @@ void AliACORDEDigitizer::Exec(Option_t* /*option*/)
 
   // 2.- get loaders
   AliRunLoader* outRunLoader =
-    AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
+    AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName());
   if (!outRunLoader) {
     Error("Exec", "Can not get output Run Loader");
     return;}
@@ -146,9 +146,9 @@ void AliACORDEDigitizer::Exec(Option_t* /*option*/)
   treeD->Branch("ACORDEdigit", &fDigits, bufsize);
 
   // 3. loop over inputs
-  for (Int_t iInput = 0; iInput < fManager->GetNinputs(); iInput++) {
+  for (Int_t iInput = 0; iInput < fDigInput->GetNinputs(); iInput++) {
     AliRunLoader* runLoader =
-      AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput));
+      AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(iInput));
     AliLoader* loader = runLoader->GetLoader("ACORDELoader");
     if (!loader) {
       Error("Exec", "Can not get ACORDE Loader for input %d", iInput);

diff --git a/ACORDE/AliACORDEDigitizer.h b/ACORDE/AliACORDEDigitizer.h
@@ -16,7 +16,7 @@
 #include "AliDigitizer.h"
 
 class TClonesArray;
-class AliRunDigitizer;
+class AliDigitizationInput;
 class AliCDBManager;
 class AliCDBStorage;
 class AliACORDECalibData;
@@ -26,11 +26,11 @@ class AliACORDEDigitizer: public AliDigitizer {
  public:
 
    AliACORDEDigitizer() ;                       // constructor
-   AliACORDEDigitizer(AliRunDigitizer *manager);// constructor
+   AliACORDEDigitizer(AliDigitizationInput* digInput);// constructor
    virtual ~AliACORDEDigitizer() ;              // destructor
 
    virtual Bool_t Init();
-   virtual void   Exec(Option_t* option=0);
+   virtual void   Digitize(Option_t* option=0);
 
    void AddDigit(Int_t* track, Int_t module, Float_t time);
    void AddDigit(Int_t* modul, Float_t time);	

diff --git a/ACORDE/AliACORDERawReader.cxx b/ACORDE/AliACORDERawReader.cxx
@@ -34,7 +34,7 @@
 ClassImp(AliACORDERawReader)
 
 AliACORDERawReader::AliACORDERawReader (AliRawReader *rawReader, Bool_t isOnline):
-       TTask("ACORDERawReader","read raw ACORDE data"),
+       TNamed("ACORDERawReader","read raw ACORDE data"),
        fRawReader(rawReader),
        fData(NULL),
        fPosition(0),

diff --git a/ACORDE/AliACORDERawReader.h b/ACORDE/AliACORDERawReader.h
@@ -10,18 +10,18 @@
 //	Mario Rodriguez Cahuantzi <[email protected]>
 //	Arturo Fernandez Tellez   <[email protected]>
 
-#include <TTask.h>
+#include <TNamed.h>
 #include "AliRawReader.h"
 
 
-class AliACORDERawReader : public TTask {
+class AliACORDERawReader : public TNamed {
   public :
 
   AliACORDERawReader(AliRawReader *rawReader,Bool_t isOnline = kFALSE) ;
 //AliACORDERawReader(AliRawReader *rawReader,Bool_t isOnline = kTRUE) ;
 
   virtual  ~AliACORDERawReader();
-  AliACORDERawReader(const AliACORDERawReader& o): TTask(o),fRawReader(0),fData(NULL),fPosition(0),fIsOnline(kFALSE),fDataSize(0)
+  AliACORDERawReader(const AliACORDERawReader& o): TNamed(o),fRawReader(0),fData(NULL),fPosition(0),fIsOnline(kFALSE),fDataSize(0)
 {
 	fWord[0] = fWord[1] = fWord[2] = fWord[3] = 0;
 }
@@ -64,7 +64,7 @@ enum EACORDERawStreamError {
       kRawDataSizeErr = 1
   };
 
- ClassDef(AliACORDERawReader,2) //class for reading ACORDE Raw data
+ ClassDef(AliACORDERawReader,3) //class for reading ACORDE Raw data
 };
 
 typedef AliACORDERawReader AliSTARTRawReader; // for backward compatibility

diff --git a/EMCAL/AliEMCAL.cxx b/EMCAL/AliEMCAL.cxx
@@ -100,12 +100,6 @@ AliEMCAL::~AliEMCAL()
   //dtor
   delete fgRawUtils;
   delete fTriggerData;
-
-  AliLoader *emcalLoader=0;
-  if ((emcalLoader = AliRunLoader::Instance()->GetDetectorLoader("EMCAL")))
-    emcalLoader->CleanSDigitizer();
-
-
 }
 
 //____________________________________________________________________________
@@ -196,10 +190,10 @@ void AliEMCAL::InitConstants()
 // }
 
 //____________________________________________________________________________
-AliDigitizer* AliEMCAL::CreateDigitizer(AliRunDigitizer* manager) const
+AliDigitizer* AliEMCAL::CreateDigitizer(AliDigitizationInput* digInput) const
 {
   //create and return the digitizer
-  return new AliEMCALDigitizer(manager);
+  return new AliEMCALDigitizer(digInput);
 }
 
 //____________________________________________________________________________
@@ -314,7 +308,7 @@ void AliEMCAL::Hits2SDigits()
   GetGeometry();
   AliEMCALSDigitizer emcalDigitizer(fLoader->GetRunLoader()->GetFileName().Data()) ;
   emcalDigitizer.SetEventRange(0, -1) ; // do all the events
-  emcalDigitizer.ExecuteTask() ;
+  emcalDigitizer.Digitize() ;
 }
 
 //______________________________________________________________________

diff --git a/EMCAL/AliEMCAL.h b/EMCAL/AliEMCAL.h
@@ -31,7 +31,6 @@
 // --- ROOT system ---
 
 class TString ;
-class TTask ;
 class TFolder ;
 class TRandom ; 
 class TGraph;
@@ -57,7 +56,7 @@ class AliEMCAL : public AliDetector {
   virtual void   AddHit(Int_t, Int_t*, Float_t *) {
     Fatal("AddHit(Int_t, Int_t*, Float_t *", "not to be used: use AddHit( Int_t shunt, Int_t primary, Int_t track,Int_t id, Float_t *hits )") ;  
   }
-  virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
+  virtual AliDigitizer* CreateDigitizer(AliDigitizationInput* digInput) const;
   virtual void  CreateMaterials() ;   
   virtual void  Init() ;   
   virtual void  Digits2Raw();