changes to be compliant with Eff C++ rules

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

diff --git a/ITS/AliITSTrigger.cxx b/ITS/AliITSTrigger.cxx
index 8147525bb1b91fa2b324c47c1da94d708ba3b136..800ad8c12fada6603b87bdc7fa357bfc3a2d6689 100644 (file)
--- a/ITS/AliITSTrigger.cxx
+++ b/ITS/AliITSTrigger.cxx
@@ -30,29 +30,32 @@
 //______________________________________________________________________
 ClassImp(AliITSTrigger)
 ////////////////////////////////////////////////////////////////////////
-//
-// Version 1
-// Modified by D. Elia, C. Jorgensen
-// March 2006
-//
-// Version 0
-// Written by J. Conrad, E. Lopez Torres 
-// October 2005
-//
-// AliITSTrigger: implementation of the SPD Fast-OR based triggers.
-//
+//                                                                    //
+// Version 1                                                          //
+// Modified by D. Elia, C. Jorgensen                                  //
+// March 2006                                                         //
+//                                                                    //
+// Version 0                                                          //
+// Written by J. Conrad, E. Lopez Torres                              //
+// October 2005                                                       //
+//                                                                    //
+// AliITSTrigger: implementation of the SPD Fast-OR based triggers.   //
+//                                                                    //
 ////////////////////////////////////////////////////////////////////////
 
 //______________________________________________________________________
 AliITSTrigger::AliITSTrigger()
-  : AliTriggerDetector()
-{
-   SetName("ITS");
-   CreateInputs();
+  : AliTriggerDetector(),
+fGlobalFOThreshold(1),
+fHighMultFOThreshold(150){
+
+  //standard constructor
+  SetName("ITS");
+  CreateInputs();
 
-   // set parameters to define trigger condition thresholds
-   fGlobalFOThreshold = 1;
-   fHighMultFOThreshold = 100; 
+  // set parameters to define trigger condition thresholds
+  //fGlobalFOThreshold = 1;
+  //fHighMultFOThreshold = 150; 
 }
 
 //______________________________________________________________________
@@ -79,6 +82,7 @@ void AliITSTrigger::Trigger()
   AliITSgeom* geom = loader->GetITSgeom();
   loader->LoadDigits("READ");
   TTree *treeD = loader->TreeD();
+  if (!treeD) return;
 
   TObjArray *digDet = 0;
   digDet = new TObjArray(3);
@@ -113,7 +117,7 @@ void AliITSTrigger::MultiplicityTriggers(TObjArray* digDet, TTree* treeD, AliITS
   Int_t ndigitsInChip[5];
 
   // loop over modules (ladders)
-  for (Int_t moduleIndex=startSPD; moduleIndex<lastSPD; moduleIndex++) {
+  for (Int_t moduleIndex=startSPD; moduleIndex<lastSPD+1; moduleIndex++) {
     treeD->GetEvent(moduleIndex);
     TClonesArray* digits = (TClonesArray*) (digDet->At(0)); // SPD only.
     
@@ -169,7 +173,7 @@ void AliITSTrigger::GeometryTriggers()
 //   //   Int_t iFOperchip[ntotal];   // not used
 //   Int_t iFOperChipinStave[20][40][2];
   
-//   for (Int_t m=startSPD;m<lastSPD;m++) {
+//   for (Int_t m=startSPD;m<lastSPD+1;m++) {
 //     iFOperladder[m] = 0;
 //   }
 
@@ -188,7 +192,7 @@ void AliITSTrigger::GeometryTriggers()
 //   Int_t checkStave = 0;
   
 //   // loop over modules
-//   for (Int_t moduleIndex=startSPD; moduleIndex<lastSPD; moduleIndex++) {
+//   for (Int_t moduleIndex=startSPD; moduleIndex<lastSPD+1; moduleIndex++) {
 //     treeD->GetEvent(moduleIndex);
 //     TClonesArray* digits = (TClonesArray*) (digDet->At(0)); // SPD only.