Merging changes from v4-04-Release

diff --git a/ITS/AliITSTrigger.cxx b/ITS/AliITSTrigger.cxx
index 8147525bb1b91fa2b324c47c1da94d708ba3b136..e11e6acb5185bb190815cb8a8dee35f4ec57cd13 100644 (file)
--- a/ITS/AliITSTrigger.cxx
+++ b/ITS/AliITSTrigger.cxx
@@ -52,7 +52,7 @@ AliITSTrigger::AliITSTrigger()
 
    // set parameters to define trigger condition thresholds
    fGlobalFOThreshold = 1;
-   fHighMultFOThreshold = 100; 
+   fHighMultFOThreshold = 150; 
 }
 
 //______________________________________________________________________
@@ -113,7 +113,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 +169,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 +188,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.
 

diff --git a/STEER/createTriggerDescriptor_pp.C b/STEER/createTriggerDescriptor_pp.C
index 93fde1f406eb92b494c2edd1f4d1347f7bda2b85..c7987544ba6997042eff0bc4519e165687414b30 100644 (file)
--- a/STEER/createTriggerDescriptor_pp.C
+++ b/STEER/createTriggerDescriptor_pp.C
@@ -20,7 +20,7 @@ createTriggerDescriptor_pp()
 
    // standalong ITS-SPD inputs
    descrip.AddCondition( "ITS_SPD_GFO_L0",  "ITS_SPD_GFO_L0",  "SPD global fast-or",        (ULong64_t)0x1 << 5 );
-   descrip.AddCondition( "ITS_SPD_HMULT_L0","ITS_SPD_HMULT_L0","SPD high mult. 100 ",       (ULong64_t)0x1 << 6 );
+   descrip.AddCondition( "ITS_SPD_HMULT_L0","ITS_SPD_HMULT_L0","SPD high mult. 150 ",       (ULong64_t)0x1 << 6 );
 
    // standalong MUON inputs
    descrip.AddCondition( "MUON_SPlus_LPt_L0",