new SDD preprocessor + removal of eff C++ warning (base) - E. Crescio

[u/mrichter/AliRoot.git] / ITS / AliITSDigitizer.cxx

diff --git a/ITS/AliITSDigitizer.cxx b/ITS/AliITSDigitizer.cxx
index 5112560cd019e86df6868391c75c9faf541a791a..f7123febd44ec8916dad88658758f23b6ae706b4 100644 (file)
--- a/ITS/AliITSDigitizer.cxx
+++ b/ITS/AliITSDigitizer.cxx
@@ -14,18 +14,18 @@
  **************************************************************************/
  
 /* $Id$ */
-
-//Piotr.Skowronski@cern.ch :
-//Corrections applied in order to compile (only) with new I/O and folder structure
-//To be implemented correctly by responsible
-//
-//  Class used to steer
-//  the digitization for ITS
-//
-//
+///////////////////////////////////////////////////////////////////////////
+//Piotr.Skowronski@cern.ch :                                             //
+//Corrections applied in order to compile (only)                         // 
+//   with new I/O and folder structure                                   //
+//To be implemented correctly by responsible                             //
+//                                                                       //
+//  Class used to steer                                                  //
+//  the digitization for ITS                                             //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
 
 #include <stdlib.h>
-#include <Riostream.h>
 #include <TClonesArray.h>
 #include <TTree.h>
 #include <TBranch.h>
@@ -35,10 +35,8 @@
 #include <AliLoader.h>
 #include <AliRunDigitizer.h>
 #include "AliITSDigitizer.h"
-#include "AliITSpList.h"
 #include "AliITSgeom.h"
 #include "AliITSsimulation.h"
-#include "AliITSDetType.h"
 
 ClassImp(AliITSDigitizer)
 
@@ -58,6 +56,7 @@ AliITSDigitizer::AliITSDigitizer() : AliDigitizer(){
     fRoif     = -1;
     fRoiifile = 0;
     fInit     = kFALSE;
+    fFlagFirstEv =kTRUE;
 }
 //______________________________________________________________________
 AliITSDigitizer::AliITSDigitizer(AliRunDigitizer *mngr) : AliDigitizer(mngr){
@@ -75,7 +74,24 @@ AliITSDigitizer::AliITSDigitizer(AliRunDigitizer *mngr) : AliDigitizer(mngr){
     fRoif     = -1;
     fRoiifile = 0;
     fInit     = kFALSE;
+    fFlagFirstEv =kTRUE;
+}
+
+//______________________________________________________________________
+AliITSDigitizer::AliITSDigitizer(const AliITSDigitizer &/*rec*/):AliDigitizer(/*rec*/){
+    // Copy constructor. 
+
+  Error("Copy constructor","Copy constructor not allowed");
+  
 }
+//______________________________________________________________________
+AliITSDigitizer& AliITSDigitizer::operator=(const AliITSDigitizer& /*source*/){
+    // Assignment operator. This is a function which is not allowed to be
+    // done.
+    Error("operator=","Assignment operator not allowed\n");
+    return *this; 
+}
+
 //______________________________________________________________________
 AliITSDigitizer::~AliITSDigitizer(){
     // Default destructor. 
@@ -85,7 +101,6 @@ AliITSDigitizer::~AliITSDigitizer(){
     //      none.
     // Return:
     //      none.
-
     fITS = 0; // don't delete fITS. Done else where.
     if(fModActive) delete[] fModActive;
 }
@@ -143,21 +158,21 @@ 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();
     AliITSsimulation *sim      = 0;
-    AliITSDetType    *iDetType = 0;
-    static Bool_t    setDef    = kTRUE;
-
+    if(fFlagFirstEv){
+      fITS->SetDefaults();    
+      fITS->SetDefaultSimulation();
+      fFlagFirstEv=kFALSE;
+    }
     if(!fInit){
-       Error("Exec","Init not succesfull, aborting.");
+       Error("Exec","Init not successful, aborting.");
        return;
     } // end if
 
-    if( setDef ) fITS->SetDefaultSimulation();
-    setDef = kFALSE;
     sprintf(name,"%s",fITS->GetName());
 
-    Int_t nfiles = GetManager()->GetNinputs();
-    Int_t event  = GetManager()->GetOutputEventNr();
     Int_t size   = fITS->GetITSgeom()->GetIndexMax();
     Int_t module,id,ifiles,mask;
     Bool_t lmod;
@@ -192,6 +207,7 @@ void AliITSDigitizer::Exec(Option_t* opt){
        Error("Exec","Can not get Output ITS Loader");
        return;
      }
+
     outgime->LoadDigits("update");
     if (outgime->TreeD() == 0x0) outgime->MakeTree("D");
     
@@ -212,18 +228,15 @@ void AliITSDigitizer::Exec(Option_t* opt){
 
     for(module=0; module<size; module++ )
      {
-        if(fModActive && fRoif!=0) if(!fModActive[module]) continue;
-        id = fITS->GetITSgeom()->GetModuleType(module);
-        if(!all && !det[id]) continue;
-        iDetType = fITS->DetType( id );
-
-        sim      = (AliITSsimulation*)iDetType->GetSimulationModel();
-        if(!sim) {
+       if(fModActive && fRoif!=0) if(!fModActive[module]) continue;
+       id = fITS->GetITSgeom()->GetModuleType(module);
+       if(!all && !det[id]) continue;
+       sim      = (AliITSsimulation*)fITS->GetSimulationModel(id);
+       if(!sim) {
             Error( "Exec", "The simulation class was not instanciated!" );
             exit(1);
         } // end if !sim
-
-        // Fill the module with the sum of SDigits
+           // Fill the module with the sum of SDigits
         sim->InitSimulationModule(module, event);
        //cout << "Module=" << module;
         for(ifiles=0; ifiles<nfiles; ifiles++ )
@@ -251,24 +264,23 @@ void AliITSDigitizer::Exec(Option_t* opt){
             // add summable digits to module
             brchSDigits->GetEvent( module );
             lmod = sim->AddSDigitsToModule(sdig,mask);
-            if(ifiles==0)
+            if(fRegionOfInterest && (ifiles==0))
              {
                fModActive[module] = lmod;
              } // end if
         } // end for ifiles
        //cout << " end ifiles loop" << endl;
         // Digitize current module sum(SDigits)->Digits
-        sim->FinishSDigitiseModule();
+       sim->FinishSDigitiseModule();
 
         // fills all branches - wasted disk space
         outgime->TreeD()->Fill();
-        fITS->ResetDigits();
+       fITS->ResetDigits();
     } // end for module
-
+    
     outgime->TreeD()->AutoSave();
     outgime->WriteDigits("OVERWRITE");
     outgime->UnloadDigits();
-    
     for(ifiles=0; ifiles<nfiles; ifiles++ )
      {
        inRL =  AliRunLoader::GetRunLoader(fManager->GetInputFolderName(fl[ifiles]));
@@ -280,6 +292,8 @@ void AliITSDigitizer::Exec(Option_t* opt){
     sdig->Clear();
     delete sdig;
     for(Int_t i=0;i<fITS->GetITSgeom()->GetIndexMax();i++) fModActive[i] = kTRUE;
+    
+
     return;
 }
 //______________________________________________________________________