filter out additional compile defines to fit into rootcints 1024 char limit

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

diff --git a/ITS/AliITSDigitizer.cxx b/ITS/AliITSDigitizer.cxx
index d38f746e37ba03696d5377ecddf72529bf8dbb4a..be7c008cd47f3218b9b1948e6fd0fd961d5c9bc0 100644 (file)
--- a/ITS/AliITSDigitizer.cxx
+++ b/ITS/AliITSDigitizer.cxx
@@ -30,10 +30,11 @@
 #include <TTree.h>
 #include <TBranch.h>
 
-#include <AliRun.h>
-#include <AliRunLoader.h>
-#include <AliLoader.h>
-#include <AliRunDigitizer.h>
+#include "AliRun.h"
+#include "AliRunLoader.h"
+#include "AliLoader.h"
+#include "AliLog.h"
+#include "AliRunDigitizer.h"
 #include "AliITSDigitizer.h"
 #include "AliITSgeom.h"
 #include "AliITSsimulation.h"
@@ -41,7 +42,13 @@
 ClassImp(AliITSDigitizer)
 
 //______________________________________________________________________
-AliITSDigitizer::AliITSDigitizer() : AliDigitizer(){
+AliITSDigitizer::AliITSDigitizer() : AliDigitizer(),
+fITS(0),
+fModActive(0),
+fInit(kFALSE),
+fRoif(-1),
+fRoiifile(0),
+fFlagFirstEv(kTRUE){
     // Default constructor. Assign fITS since it is never written out from
     // here. 
     // Inputs:
@@ -51,14 +58,15 @@ AliITSDigitizer::AliITSDigitizer() : AliDigitizer(){
     // Return:
     //      A blank AliITSDigitizer class.
 
-    fITS      = 0;
-    fModActive   = 0;
-    fRoif     = -1;
-    fRoiifile = 0;
-    fInit     = kFALSE;
 }
 //______________________________________________________________________
-AliITSDigitizer::AliITSDigitizer(AliRunDigitizer *mngr) : AliDigitizer(mngr){
+AliITSDigitizer::AliITSDigitizer(AliRunDigitizer *mngr) : AliDigitizer(mngr),
+fITS(0),
+fModActive(0),
+fInit(kFALSE),
+fRoif(-1),
+fRoiifile(0),
+fFlagFirstEv(kTRUE){
     // Standard constructor. Assign fITS since it is never written out from
     // here. 
     // Inputs:
@@ -68,27 +76,8 @@ AliITSDigitizer::AliITSDigitizer(AliRunDigitizer *mngr) : AliDigitizer(mngr){
     // Return:
     //      An AliItSDigitizer class.
 
-    fITS      = 0;
-    fModActive   = 0;
-    fRoif     = -1;
-    fRoiifile = 0;
-    fInit     = kFALSE;
 }
 
-//______________________________________________________________________
-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(){
@@ -99,7 +88,6 @@ AliITSDigitizer::~AliITSDigitizer(){
     //      none.
     // Return:
     //      none.
-
     fITS = 0; // don't delete fITS. Done else where.
     if(fModActive) delete[] fModActive;
 }
@@ -157,19 +145,22 @@ 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;
-    fITS->SetDefaults();
-    fITS->SetDefaultSimulation();
+    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
 
     sprintf(name,"%s",fITS->GetName());
 
-    Int_t nfiles = GetManager()->GetNinputs();
-    Int_t event  = GetManager()->GetOutputEventNr();
-     Int_t size   = fITS->GetITSgeom()->GetIndexMax();
+    Int_t size   = fITS->GetITSgeom()->GetIndexMax();
     Int_t module,id,ifiles,mask;
     Bool_t lmod;
     Int_t *fl = new Int_t[nfiles];
@@ -209,11 +200,13 @@ void AliITSDigitizer::Exec(Option_t* opt){
     
     // Digitize
     fITS->MakeBranchInTreeD(outgime->TreeD());
-    if(fRoif!=0) Info("AliITSDigitizer","Region of Interest digitization selected");
-    else Info("AliITSDigitizer","No Region of Interest selected. Digitizing everything");
-    //cout <<"fModActive="<<fModActive<<" fRoif="<<fRoif;
+    if(fRoif!=0) {
+      AliDebug(1,"Region of Interest digitization selected");
+    }
+    else {
+      AliDebug(1,"No Region of Interest selected. Digitizing everything");
+    }
     if(fModActive==0) fRoif = 0; // fModActive array must be define for RIO cuts.
-    //cout <<" fRoif="<<fRoif<<endl;
 
     for(ifiles=0; ifiles<nfiles; ifiles++ )
      {
@@ -339,7 +332,7 @@ void AliITSDigitizer::SetByRegionOfInterest(TTree *ts){
       //cout << fModActive[m];
       //cout << endl;
     } // end for m
-    Info("AliITSDigitizer","Digitization by Region of Interest selected");
+    AliDebug(1,"Digitization by Region of Interest selected");
     sdig->Clear();
     delete sdig;
     return;