X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSDigitizer.cxx;h=2b180269ef2992895234972ed6ebff7a88bd1f8a;hb=6bc9851fb8de75d8dd58a05ad37da88f7bbb5869;hp=b306e01a684cdf9eac178197563e667f23cb90ac;hpb=e3c90d69ccf5a3ae46239796c43fecbf14a130cb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSDigitizer.cxx b/ITS/AliITSDigitizer.cxx
index b306e01a684..2b180269ef2 100644
--- a/ITS/AliITSDigitizer.cxx
+++ b/ITS/AliITSDigitizer.cxx
@@ -34,7 +34,7 @@
 #include "AliRunLoader.h"
 #include "AliLoader.h"
 #include "AliLog.h"
-#include "AliRunDigitizer.h"
+#include "AliDigitizationInput.h"
 #include "AliITSDigitizer.h"
 #include "AliITSgeom.h"
 #include "AliITSgeomTGeo.h"
@@ -59,11 +59,11 @@ fFlagFirstEv(kTRUE){
     // Return:
     //      A blank AliITSDigitizer class.
   fModActive = new Bool_t[AliITSgeomTGeo::GetNModules()];
-  for(Int_t i=0;i<fITS->GetITSgeom()->GetIndexMax();i++) fModActive[i] = kTRUE;
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNModules();i++) fModActive[i] = kTRUE;
 
 }
 //______________________________________________________________________
-AliITSDigitizer::AliITSDigitizer(AliRunDigitizer *mngr) : AliDigitizer(mngr),
+AliITSDigitizer::AliITSDigitizer(AliDigitizationInput* digInp) : AliDigitizer(digInp),
 fITS(0),
 fModActive(0),
 fInit(kFALSE),
@@ -79,7 +79,7 @@ fFlagFirstEv(kTRUE){
     // Return:
     //      An AliItSDigitizer class.
   fModActive = new Bool_t[AliITSgeomTGeo::GetNModules()];
-  for(Int_t i=0;i<fITS->GetITSgeom()->GetIndexMax();i++) fModActive[i] = kTRUE;
+  for(Int_t i=0;i<AliITSgeomTGeo::GetNModules();i++) fModActive[i] = kTRUE;
 }
 
 
@@ -130,7 +130,7 @@ Bool_t AliITSDigitizer::Init(){
     return fInit;
 }
 //______________________________________________________________________
-void AliITSDigitizer::Exec(Option_t* opt){
+void AliITSDigitizer::Digitize(Option_t* opt){
     // Main digitization function. 
     // Inputs:
     //      Option_t * opt   list of sub detector to digitize. =0 all.
@@ -145,8 +145,8 @@ void AliITSDigitizer::Exec(Option_t* opt){
                           strstr(opt,"SSD")};
     if( !det[0] && !det[1] && !det[2] ) all = "All";
     else all = 0;
-    Int_t nfiles = GetManager()->GetNinputs();
-    Int_t event  = GetManager()->GetOutputEventNr();
+    Int_t nfiles = GetDigInput()->GetNinputs();
+    Int_t event  = GetDigInput()->GetOutputEventNr();
     AliITSsimulation *sim      = 0;
     if(fFlagFirstEv){
       fITS->SetDefaults();    
@@ -181,7 +181,7 @@ void AliITSDigitizer::Exec(Option_t* opt){
     AliRunLoader *inRL = 0x0, *outRL = 0x0;
     AliLoader *ingime = 0x0, *outgime = 0x0;    
     
-    outRL = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());    
+    outRL = AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName());    
     if ( outRL == 0x0)
      {
        Error("Exec","Can not get Output Run Loader");
@@ -212,7 +212,7 @@ void AliITSDigitizer::Exec(Option_t* opt){
 
     for(ifiles=0; ifiles<nfiles; ifiles++ )
      {
-       inRL =  AliRunLoader::GetRunLoader(fManager->GetInputFolderName(fl[ifiles]));
+       inRL =  AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(fl[ifiles]));
        ingime = inRL->GetLoader(loadname);
        if (ingime->TreeS() == 0x0) ingime->LoadSDigits();
      }
@@ -234,7 +234,7 @@ void AliITSDigitizer::Exec(Option_t* opt){
          {
            if(fRoif!=0) if(!fModActive[module]) continue;
             
-           inRL =  AliRunLoader::GetRunLoader(fManager->GetInputFolderName(fl[ifiles]));
+           inRL =  AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(fl[ifiles]));
            ingime = inRL->GetLoader(loadname);
            
            TTree *treeS = ingime->TreeS();
@@ -252,11 +252,11 @@ void AliITSDigitizer::Exec(Option_t* opt){
 		return;
             } // end if brchSDigits
             sdig->Clear();
-            mask = GetManager()->GetMask(ifiles);
+            mask = GetDigInput()->GetMask(ifiles);
             // add summable digits to module
             brchSDigits->GetEvent( module );
             lmod = sim->AddSDigitsToModule(sdig,mask);
-            if(fRegionOfInterest && (ifiles==0))
+            if(GetRegionOfInterest() && (ifiles==0))
              {
                fModActive[module] = lmod;
              } // end if
@@ -269,13 +269,13 @@ void AliITSDigitizer::Exec(Option_t* opt){
         outgime->TreeD()->Fill();
 	fITS->ResetDigits();
     } // end for module
-    
+    fITS->WriteFOSignals(); 
     outgime->TreeD()->AutoSave();
     outgime->WriteDigits("OVERWRITE");
     outgime->UnloadDigits();
     for(ifiles=0; ifiles<nfiles; ifiles++ )
      {
-       inRL =  AliRunLoader::GetRunLoader(fManager->GetInputFolderName(fl[ifiles]));
+       inRL =  AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(fl[ifiles]));
        ingime = inRL->GetLoader(loadname);
        ingime->UnloadSDigits();
      }