Changed AddSDigits to Module to return a Bool_t. True if there was a non noise

 signal in that module.

diff --git a/ITS/AliITSsimulation.cxx b/ITS/AliITSsimulation.cxx
index f22ca2b9a3c6956f4f4f1081cbcf9b32a1a9959b..2a40f90e5e51c872b1da6ecdcb65054578618b96 100644 (file)
--- a/ITS/AliITSsimulation.cxx
+++ b/ITS/AliITSsimulation.cxx
@@ -18,7 +18,7 @@
 #include "AliITSsimulation.h"
 #include "AliITSpList.h"
 
 #include "AliITSsimulation.h"
 #include "AliITSpList.h"
 

-ClassImp(AliITSsimulation)     
+ClassImp(AliITSsimulation)

 
 AliITSsimulation::AliITSsimulation(){
     // constructor
 
 AliITSsimulation::AliITSsimulation(){
     // constructor


@@ -59,9 +59,10 @@ AliITSsimulation&  AliITSsimulation::operator=(const AliITSsimulation &source){
     return *this;
 }
 //______________________________________________________________________
     return *this;
 }
 //______________________________________________________________________

-void AliITSsimulation::AddSDigitsToModule(TClonesArray *pItemA,Int_t mask ){
+Bool_t AliITSsimulation::AddSDigitsToModule(TClonesArray *pItemA,Int_t mask ){

     // Add Summable digits to module maps.
     Int_t nItems = pItemA->GetEntries();
     // Add Summable digits to module maps.
     Int_t nItems = pItemA->GetEntries();

+    Bool_t sig = kFALSE;

  
     // cout << "Adding "<< nItems <<" SDigits to module " << fModule << endl;
     for( Int_t i=0; i<nItems; i++ ) {
  
     // cout << "Adding "<< nItems <<" SDigits to module " << fModule << endl;
     for( Int_t i=0; i<nItems; i++ ) {


@@ -70,8 +71,10 @@ void AliITSsimulation::AddSDigitsToModule(TClonesArray *pItemA,Int_t mask ){
             Error( "AddSDigitsToModule","Error reading, SDigits module %d "
                   "!= current module %d: exit",
                   pItem->GetModule(), fModule );
             Error( "AddSDigitsToModule","Error reading, SDigits module %d "
                   "!= current module %d: exit",
                   pItem->GetModule(), fModule );

-            return;
+            return sig;

         } // end if
         } // end if

+       if(pItem->GetSignal()>0.0 ) sig = kTRUE;

         fpList->AddItemTo( mask, pItem );
     } // end for i
         fpList->AddItemTo( mask, pItem );
     } // end for i

+    return sig;

 }
 }

diff --git a/ITS/AliITSsimulation.h b/ITS/AliITSsimulation.h
index 7c7f8ef7961950dca4e3cc0b9b2b5b430b5ae8f2..26a51a905cc14cfa7e03e523bcb48f21713bb8e2 100644 (file)
--- a/ITS/AliITSsimulation.h
+++ b/ITS/AliITSsimulation.h
@@ -48,8 +48,9 @@ class AliITSsimulation : public TObject {
     // Reset module arrays (maps), etc
     virtual void InitSimulationModule( Int_t module, Int_t event ){;}
     // add (sum) a new list of summable digits to module, 
     // Reset module arrays (maps), etc
     virtual void InitSimulationModule( Int_t module, Int_t event ){;}
     // add (sum) a new list of summable digits to module, 

-    // add an offset (mask) to the track numbers
-    virtual void AddSDigitsToModule( TClonesArray *pItemArray, Int_t mask );
+    // add an offset (mask) to the track numbers. Returns kTRUE if there
+    // is a "good" signal in this module.
+    virtual Bool_t AddSDigitsToModule( TClonesArray *pItemArray, Int_t mask );

     // digitize module using the "slow" detector simulator from
     // the sum of summable digits.
     virtual void FinishSDigitiseModule(){;}
     // digitize module using the "slow" detector simulator from
     // the sum of summable digits.
     virtual void FinishSDigitiseModule(){;}

diff --git a/ITS/AliITSsimulationSPD.h b/ITS/AliITSsimulationSPD.h
index 8de976fa66332b0eb7b8d8f8bb2fa20d07aa8f74..7d6bae204709c14de92a63d48cce8b17641d4849 100644 (file)
--- a/ITS/AliITSsimulationSPD.h
+++ b/ITS/AliITSsimulationSPD.h
@@ -32,8 +32,6 @@ class AliITSsimulationSPD : public AliITSsimulation {
     // Sum digitize module
     // Create maps to build the lists of tracks for each summable digit
     void InitSimulationModule(Int_t module,Int_t events);
     // Sum digitize module
     // Create maps to build the lists of tracks for each summable digit
     void InitSimulationModule(Int_t module,Int_t events);

-//    // Add summable digits to module maps.
-//    void AddSDigitsToModule(TClonesArray *sdig,Int_t mask);

     // Digitize module from the sum of summable digits.
     void FinishSDigitiseModule();
     void SDigitiseModule(AliITSmodule *mod, Int_t dummy0,Int_t dummy1);
     // Digitize module from the sum of summable digits.
     void FinishSDigitiseModule();
     void SDigitiseModule(AliITSmodule *mod, Int_t dummy0,Int_t dummy1);

diff --git a/ITS/AliITSsimulationSSD.h b/ITS/AliITSsimulationSSD.h
index 3a7804ef39a379981a0a9e774c91a71b769054eb..336838ce34ad27fd2293223ca288cda0e06454af 100644 (file)
--- a/ITS/AliITSsimulationSSD.h
+++ b/ITS/AliITSsimulationSSD.h
@@ -29,8 +29,6 @@ class AliITSsimulationSSD: public AliITSsimulation {
     void Init(AliITSsegmentationSSD *seg,AliITSresponseSSD *resp);
     // Create maps to build the lists of tracks for each summable digit
     void InitSimulationModule(Int_t module,Int_t events);
     void Init(AliITSsegmentationSSD *seg,AliITSresponseSSD *resp);
     // Create maps to build the lists of tracks for each summable digit
     void InitSimulationModule(Int_t module,Int_t events);

-//    // Add summable digits to module maps.
-//    void AddSDigitsToModule(TClonesArray *sdig,Int_t mask);

     // Digitize module from the sum of summable digits.
     void FinishSDigitiseModule();
     //Digitizes all of the hits in a module
     // Digitize module from the sum of summable digits.
     void FinishSDigitiseModule();
     //Digitizes all of the hits in a module