]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ANALYSIS/AliPhysicsSelection.cxx
fixing bug in par file creation when package name was equally to a directory name...
[u/mrichter/AliRoot.git] / ANALYSIS / AliPhysicsSelection.cxx
index e87597ff9aabb70a3c6a3f63ec4e15dd5722e76e..bea501f025eb9509437c0e99b84fd056d5cf18bd 100644 (file)
 #include <AliESDEvent.h>
 #include <AliAnalysisTaskSE.h>
 #include "AliAnalysisManager.h"
+#include "TPRegexp.h"
 
 ClassImp(AliPhysicsSelection)
 
@@ -130,7 +131,9 @@ AliPhysicsSelection::AliPhysicsSelection() :
   fSkipV0(0),
   fBIFactorA(1),
   fBIFactorC(1),
+  fBIFactorAC(1), 
   fComputeBG(0),
+  fBGStatOffset(0),
   fUseBXNumbers(1),
   fUseMuonTriggers(0),
   fFillingScheme(""),
@@ -177,21 +180,27 @@ AliPhysicsSelection::~AliPhysicsSelection()
     delete fHistTriggerPattern;
     fHistTriggerPattern = 0;
   }
-
+  if (fBackgroundIdentification)
+  { 
+    delete fBackgroundIdentification;
+    fBackgroundIdentification = 0;
+  }  
 }
 
-UInt_t AliPhysicsSelection::CheckTriggerClass(const AliESDEvent* aEsd, const char* trigger) const
+UInt_t AliPhysicsSelection::CheckTriggerClass(const AliESDEvent* aEsd, const char* trigger, Int_t& triggerLogic) const
 {
   // checks if the given trigger class(es) are found for the current event
-  // format of trigger: +TRIGGER1 -TRIGGER2 [#XXX] [&YY]
+  // format of trigger: +TRIGGER1 -TRIGGER2 [#XXX] [&YY] [*ZZ]
   //   requires TRIGGER1 and rejects TRIGGER2
   //   in bunch crossing XXX
   //   if successful, YY is returned (for association between entry in fCollTrigClasses and AliVEvent::EOfflineTriggerTypes)
+  //   triggerLogic is filled with ZZ, defaults to kCINT1
   
   Bool_t foundBCRequirement = kFALSE;
   Bool_t foundCorrectBC = kFALSE;
   
   UInt_t returnCode = AliVEvent::kUserDefined;
+  triggerLogic = kCINT1;
   
   TString str(trigger);
   TObjArray* tokens = str.Tokenize(" ");
@@ -240,6 +249,12 @@ UInt_t AliPhysicsSelection::CheckTriggerClass(const AliESDEvent* aEsd, const cha
       
       returnCode = str2.Atoll();
     }
+    else if (str2[0] == '*')
+    {
+      str2.Remove(0, 1);
+      
+      triggerLogic = str2.Atoi();
+    }
     else
       AliFatal(Form("Invalid trigger syntax: %s", trigger));
   }
@@ -251,17 +266,43 @@ UInt_t AliPhysicsSelection::CheckTriggerClass(const AliESDEvent* aEsd, const cha
   
   return returnCode;
 }
-    
+
+//______________________________________________________________________________
+TObject *AliPhysicsSelection::GetStatistics(Option_t *option) const
+{
+// Get the statistics histograms ("ALL" and "BIN0")
+   TString opt(option);
+   opt.ToUpper();
+   Int_t ihist = 0;
+   if (opt == "ALL") ihist = kStatIdxAll;
+   if (opt == "BIN0") ihist = kStatIdxBin0;
+   return fHistStatistics[ihist];
+}   
+
+//______________________________________________________________________________
 UInt_t AliPhysicsSelection::IsCollisionCandidate(const AliESDEvent* aEsd)
 {
   // checks if the given event is a collision candidate
   //
   // returns a bit word describing the fired offline triggers (see AliVEvent::EOfflineTriggerTypes)
-  
-  if (fCurrentRun != aEsd->GetRunNumber())
-    if (!Initialize(aEsd->GetRunNumber()))
+  AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
+  if (!mgr) {
+    AliError("Cannot get the analysis manager");
+    return 0;
+  } 
+  mgr->LoadBranch("AliESDHeader.");
+  mgr->LoadBranch("AliESDRun.");
+  mgr->LoadBranch("AliMultiplicity.");
+  mgr->LoadBranch("AliESDFMD.");
+  mgr->LoadBranch("AliESDVZERO.");
+  mgr->LoadBranch("AliESDZDC.");
+  mgr->LoadBranch("SPDVertex.");
+  mgr->LoadBranch("PrimaryVertex.");
+  if (fCurrentRun != aEsd->GetRunNumber()) {
+    if (!Initialize(aEsd))
       AliFatal(Form("Could not initialize for run %d", aEsd->GetRunNumber()));
-    
+    if(fComputeBG) SetBIFactors(aEsd); // is this safe here?
+  }
   const AliESDHeader* esdHeader = aEsd->GetHeader();
   if (!esdHeader)
   {
@@ -298,37 +339,31 @@ UInt_t AliPhysicsSelection::IsCollisionCandidate(const AliESDEvent* aEsd)
   
     triggerAnalysis->FillTriggerClasses(aEsd);
     
-    UInt_t singleTriggerResult = CheckTriggerClass(aEsd, triggerClass);
+    Int_t triggerLogic = 0; 
+    UInt_t singleTriggerResult = CheckTriggerClass(aEsd, triggerClass, triggerLogic);
+    
     if (singleTriggerResult)
     {
       triggerAnalysis->FillHistograms(aEsd);
   
       Bool_t isBin0 = kFALSE;
       if (fBin0CallBack != "") {
-       AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
-       if (!mgr) {
-         AliError("Cannot get the analysis manager");
-       }  
-       else {
          isBin0 = ((AliAnalysisTaskSE*)mgr->GetTask(fBin0CallBack.Data()))->IsEventInBinZero();
-       }
       } else if (fBin0CallBackPointer) {
          isBin0 = (*fBin0CallBackPointer)(aEsd);
-       
       }
       
-
-      
-      // hardware trigger (should only remove events for MC)
-      // replay CINT1B hardware trigger
-      // TODO this has to depend on the actual hardware trigger (and that depends on the run...)
+      // hardware trigger
       Int_t fastORHW = triggerAnalysis->SPDFiredChips(aEsd, 1); // SPD number of chips from trigger bits (!)
-      Bool_t v0A       = fSkipV0 ? 0 :triggerAnalysis->IsOfflineTriggerFired(aEsd, AliTriggerAnalysis::kV0A);
-      Bool_t v0C       = fSkipV0 ? 0 :triggerAnalysis->IsOfflineTriggerFired(aEsd, AliTriggerAnalysis::kV0C);
+      Int_t fastORHWL1 = triggerAnalysis->SPDFiredChips(aEsd, 1, kFALSE, 2); // SPD number of chips from trigger bits in second layer (!)
       Bool_t v0AHW     = fSkipV0 ? 0 :(triggerAnalysis->V0Trigger(aEsd, AliTriggerAnalysis::kASide, kTRUE) == AliTriggerAnalysis::kV0BB);// should replay hw trigger
       Bool_t v0CHW     = fSkipV0 ? 0 :(triggerAnalysis->V0Trigger(aEsd, AliTriggerAnalysis::kCSide, kTRUE) == AliTriggerAnalysis::kV0BB);// should replay hw trigger
+      
       // offline trigger
       Int_t fastOROffline = triggerAnalysis->SPDFiredChips(aEsd, 0); // SPD number of chips from clusters (!)
+      Int_t fastOROfflineL1 = triggerAnalysis->SPDFiredChips(aEsd, 0, kFALSE, 2); // SPD number of chips from clusters in second layer (!)
+      Bool_t v0A       = fSkipV0 ? 0 :triggerAnalysis->IsOfflineTriggerFired(aEsd, AliTriggerAnalysis::kV0A);
+      Bool_t v0C       = fSkipV0 ? 0 :triggerAnalysis->IsOfflineTriggerFired(aEsd, AliTriggerAnalysis::kV0C);
       Bool_t v0ABG = fSkipV0 ? 0 :triggerAnalysis->IsOfflineTriggerFired(aEsd, AliTriggerAnalysis::kV0ABG);
       Bool_t v0CBG = fSkipV0 ? 0 :triggerAnalysis->IsOfflineTriggerFired(aEsd, AliTriggerAnalysis::kV0CBG);
       Bool_t v0BG = v0ABG || v0CBG;
@@ -339,7 +374,14 @@ UInt_t AliPhysicsSelection::IsCollisionCandidate(const AliESDEvent* aEsd)
       Bool_t fmd  = fmdA || fmdC;
     
       // SSD
-      Int_t ssdClusters = triggerAnalysis->SSDClusters(aEsd);
+      //Int_t ssdClusters = triggerAnalysis->SSDClusters(aEsd);
+      
+      // ZDC
+      // Bool_t zdcA = triggerAnalysis->IsOfflineTriggerFired(aEsd, AliTriggerAnalysis::kZDCA);
+      // Bool_t zdcC = triggerAnalysis->IsOfflineTriggerFired(aEsd, AliTriggerAnalysis::kZDCC);
+      Bool_t zdcA = triggerAnalysis->ZDCTDCTrigger(aEsd, AliTriggerAnalysis::kASide);
+      Bool_t zdcC = triggerAnalysis->ZDCTDCTrigger(aEsd, AliTriggerAnalysis::kCSide);
+      
 
       // Some "macros"
       Bool_t mb1 = (fastOROffline > 0 || v0A || v0C) && (!v0BG);
@@ -350,14 +392,23 @@ UInt_t AliPhysicsSelection::IsCollisionCandidate(const AliESDEvent* aEsd)
       if (fBackgroundIdentification)
         bgID = ! fBackgroundIdentification->IsSelected(const_cast<AliESDEvent*> (aEsd));
       
-      Int_t ntrig = fastOROffline; // any 2 hits
+      /*Int_t ntrig = fastOROffline; // any 2 hits
       if(v0A)              ntrig += 1;
       if(v0C)              ntrig += 1; //v0C alone is enough
       if(fmd)              ntrig += 1;
-      if(ssdClusters>1)    ntrig += 1;
+      if(ssdClusters>1)    ntrig += 1;*/
 
-
-      Bool_t hwTrig = fastORHW > 0 || v0AHW || v0CHW;
+      // replay hardware trigger (should only remove events for MC)
+      
+      Bool_t hwTrig = kFALSE;
+      switch (triggerLogic)
+      {
+        case kCINT1:  hwTrig = fastORHW > 0 || v0AHW || v0CHW; break;
+        case kCMBS2A: hwTrig = fastORHWL1 > 1 && v0AHW; break;
+        case kCMBS2C: hwTrig = fastORHWL1 > 1 && v0CHW; break;
+        case kCMBAC:  hwTrig = v0AHW && v0CHW; break;
+        default: AliFatal(Form("Undefined trigger logic %d", triggerLogic)); break;
+      }
 
       // Fill trigger pattern histo
       Int_t tpatt = 0;
@@ -373,8 +424,6 @@ UInt_t AliPhysicsSelection::IsCollisionCandidate(const AliESDEvent* aEsd)
       
        fHistStatistics[iHistStat]->Fill(kStatTriggerClass, i);
 
-
-
        // We fill the rest only if hw trigger is ok
        if (!hwTrig)
          {
@@ -402,34 +451,49 @@ UInt_t AliPhysicsSelection::IsCollisionCandidate(const AliESDEvent* aEsd)
        if (fmd)
          fHistStatistics[iHistStat]->Fill(kStatFMD, i);
 
-       if(ssdClusters>1)
-         fHistStatistics[iHistStat]->Fill(kStatSSD1, i);
-
-       if(ntrig >= 2 && !v0BG) 
-         fHistStatistics[iHistStat]->Fill(kStatAny2Hits, i);
+       //if(ntrig >= 2 && !v0BG) 
+       //  fHistStatistics[iHistStat]->Fill(kStatAny2Hits, i);
 
        if (fastOROffline > 0)
          fHistStatistics[iHistStat]->Fill(kStatFO1, i);
        if (fastOROffline > 1)
          fHistStatistics[iHistStat]->Fill(kStatFO2, i);
+       if (fastOROfflineL1 > 1)
+         fHistStatistics[iHistStat]->Fill(kStatFO2L1, i);
         
        if (v0A)
          fHistStatistics[iHistStat]->Fill(kStatV0A, i);
        if (v0C)
          fHistStatistics[iHistStat]->Fill(kStatV0C, i);
+         
+       if (zdcA)
+         fHistStatistics[iHistStat]->Fill(kStatZDCA, i);
+       if (zdcC)
+         fHistStatistics[iHistStat]->Fill(kStatZDCC, i);
+       if (zdcA && zdcC)
+         fHistStatistics[iHistStat]->Fill(kStatZDCAC, i);
         
        //       if (fastOROffline > 1 && !v0BG)
        //         fHistStatistics[iHistStat]->Fill(kStatFO2NoBG, i);
             
-       if (fastOROffline > 0 && (v0A || v0C) && !v0BG)
-         fHistStatistics[iHistStat]->Fill(kStatFO1AndV0, i);
+       //if (fastOROffline > 0 && (v0A || v0C) && !v0BG)
+       //  fHistStatistics[iHistStat]->Fill(kStatFO1AndV0, i);
   
        if (v0A && v0C && !v0BG && !bgID)
          fHistStatistics[iHistStat]->Fill(kStatV0, i);
 
+        Bool_t offlineAccepted = kFALSE;
+        
+        switch (triggerLogic)
+        {
+          case kCINT1:  offlineAccepted = mb1; break;
+          case kCMBS2A: offlineAccepted = fastOROfflineL1 > 1 && v0A; break;
+          case kCMBS2C: offlineAccepted = fastOROfflineL1 > 1 && v0C; break;
+          case kCMBAC:  offlineAccepted = v0A && v0C; break;
+          default: AliFatal(Form("Undefined trigger logic %d", triggerLogic)); break;
+        }
 
-       if ( mb1 )
-       
+       if ( offlineAccepted )
          {
            if (!v0BG || fSkipV0)
              {
@@ -442,7 +506,7 @@ UInt_t AliPhysicsSelection::IsCollisionCandidate(const AliESDEvent* aEsd)
                  }
                else
                  {
-                   AliDebug(AliLog::kDebug, "Accepted event for histograms");
+                   AliDebug(AliLog::kDebug, Form("Accepted event for histograms with trigger logic %d", triggerLogic));
             
                    fHistStatistics[iHistStat]->Fill(kStatAccepted, i);
                    if(iHistStat == kStatIdxAll) fHistBunchCrossing->Fill(aEsd->GetBunchCrossNumber(), i); // Fill only for all (avoid double counting)
@@ -454,7 +518,7 @@ UInt_t AliPhysicsSelection::IsCollisionCandidate(const AliESDEvent* aEsd)
              AliDebug(AliLog::kDebug, "Rejecting event because of V0 BG flag");
          }
        else
-         AliDebug(AliLog::kDebug, "Rejecting event because trigger condition is not fulfilled");
+         AliDebug(AliLog::kDebug, Form("Rejecting event because trigger logic %d is not fulfilled", triggerLogic));
       }
     }
   }
@@ -483,7 +547,7 @@ Int_t AliPhysicsSelection::GetTriggerScheme(UInt_t runNumber) const
       return 2;
   }
   
-  // default: CINT1 suite
+  // defaults
   return 1;
 }  
 
@@ -527,6 +591,12 @@ const char * AliPhysicsSelection::GetFillingScheme(UInt_t runNumber)  {
   else if (runNumber >= 120741 && runNumber <= 122375) {
     return "Single_13b_8_8_8";
   }
+  else if (runNumber >= 130148 && runNumber <= 130375) {
+    return "125n_48b_36_16_36";
+  } 
+  else if (runNumber >= 130601 && runNumber <= 130640) {
+    return "1000ns_50b_35_14_35";
+  }
   else {
     AliError(Form("Unknown filling scheme (run %d)", runNumber));
   }
@@ -543,48 +613,48 @@ const char * AliPhysicsSelection::GetBXIDs(UInt_t runNumber, const char * trigge
     else if(!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return " #346 #3465";
     else if(!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return " #1234 #1680";
     else if(!strcmp("CINT1-E-NOPF-ALL",trigger))     return " #790";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
   } 
   else if (runNumber >= 104315 && runNumber <= 104321) {
     if     (!strcmp("CINT1B-ABCE-NOPF-ALL",trigger)) return " #2000 #2891";
     else if(!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return " #218 #3337";
     else if(!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return " #1106 #1552";
     else if(!strcmp("CINT1-E-NOPF-ALL",trigger))     return " #790";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
   }
   else if (runNumber >= 104792 && runNumber <= 104803) {
     if     (!strcmp("CINT1B-ABCE-NOPF-ALL",trigger)) return " #2228 #3119";
     else if(!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return " #2554 #446";
     else if(!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return " #1334 #769";
     else if(!strcmp("CINT1-E-NOPF-ALL",trigger))     return " #790";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
   }
   else if (runNumber >= 104824 && runNumber <= 104892) {
     if     (!strcmp("CINT1B-ABCE-NOPF-ALL",trigger)) return " #3119 #769";
     else if(!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return " #2554 #446";
     else if(!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return " #1334 #2228";
     else if(!strcmp("CINT1-E-NOPF-ALL",trigger))     return " #790";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
   }
   else if (runNumber == 105143 || runNumber == 105160) {
     if     (!strcmp("CINT1B-ABCE-NOPF-ALL",trigger)) return " #1337 #1418 #2228 #2309 #3119 #3200 #446 #527";
     else if(!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return " #1580  #1742  #1904  #2066  #2630  #2792  #2954  #3362";
     else if(!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return "  #845  #1007  #1169   #1577 #3359 #3521 #119  #281 ";
     else if(!strcmp("CINT1-E-NOPF-ALL",trigger))     return " #790";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
   }
   else if (runNumber >= 105256 && runNumber <= 105268) {
     if     (!strcmp("CINT1B-ABCE-NOPF-ALL",trigger)) return " #3019 #669";
     else if(!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return " #2454 #346";
     else if(!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return " #1234 #2128";
     else if(!strcmp("CINT1-E-NOPF-ALL",trigger))     return " #790";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
   } else if (runNumber >= 114786 && runNumber <= 116684) { // 7 TeV 2010, assume always the same filling scheme
     if     (!strcmp("CINT1B-ABCE-NOPF-ALL",trigger)) return " #346";
     else if(!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return " #2131";
     else if(!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return " #3019";
     else if(!strcmp("CINT1-E-NOPF-ALL",trigger))     return " #1238";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
   }
   else if (runNumber >= 117048 && runNumber <= 117120) {
     //    return "Single_3b_2_2_2";
@@ -592,16 +662,26 @@ const char * AliPhysicsSelection::GetBXIDs(UInt_t runNumber, const char * trigge
    else if (!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return "   #2131 ";
    else if (!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return "   #3019 ";
    else if (!strcmp("CINT1-E-NOPF-ALL",trigger)) return " #1238";
-   else AliError(Form("Unknown trigger: %s", trigger));
+   //   else AliError(Form("Unknown trigger: %s", trigger));
 
   }
-  else if (runNumber >= 117220 && runNumber <= 119163) {
+  else if ((runNumber >= 117220 && runNumber <= 118555) || (runNumber >= 118784 && runNumber <= 119163)) 
+  {
     //    return "Single_2b_1_1_1";
     if      (!strcmp("CINT1B-ABCE-NOPF-ALL",trigger)) return "   #346 ";
     else if (!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return "   #2131 ";
     else if (!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return "   #3019 ";
     else if (!strcmp("CINT1-E-NOPF-ALL",trigger)) return " #1238 ";
-    else AliError(Form("Unknown trigger: %s", trigger));                                                   
+    //    else AliError(Form("Unknown trigger: %s", trigger));                                             
+  }
+  else if (runNumber >= 118556 && runNumber <= 118783) {
+    //    return "Single_2b_1_1_1"; 
+    // same as previous but was misaligned by 1 BX in fill 1069
+    if      (!strcmp("CINT1B-ABCE-NOPF-ALL",trigger)) return "   #345 ";
+    else if (!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return "   #2130 ";
+    else if (!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return "   #3018 ";
+    else if (!strcmp("CINT1-E-NOPF-ALL",trigger)) return " #1238 ";
+    //    else AliError(Form("Unknown trigger: %s", trigger));                                             
   }
   else if (runNumber >= 119837 && runNumber <= 119862) {
     //    return "Single_4b_2_2_2";
@@ -609,7 +689,7 @@ const char * AliPhysicsSelection::GetBXIDs(UInt_t runNumber, const char * trigge
     else if (!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return "   #346  #2454 ";
     else if (!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return "   #1234  #2128 ";
     else if (!strcmp("CINT1-E-NOPF-ALL",trigger)) return " #1681 #3463";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
 
   }
   else if (runNumber >= 119902 && runNumber <= 120691) {
@@ -618,7 +698,7 @@ const char * AliPhysicsSelection::GetBXIDs(UInt_t runNumber, const char * trigge
     else if (!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return "   #2131  #2331  #2531 ";
     else if (!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return "   #3019  #3219  #3419 ";
     else if (!strcmp("CINT1-E-NOPF-ALL",trigger)) return " #1296 #1670";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
   }
   else if (runNumber >= 120741 && runNumber <= 122375) {
     //    return "Single_13b_8_8_8";
@@ -626,7 +706,7 @@ const char * AliPhysicsSelection::GetBXIDs(UInt_t runNumber, const char * trigge
     else if (!strcmp("CINT1A-ABCE-NOPF-ALL",trigger)) return "   #946  #2131  #2231  #2331  #2431 ";
     else if (!strcmp("CINT1C-ABCE-NOPF-ALL",trigger)) return "   #3019  #3119  #3219  #3319  #3519 ";
     else if (!strcmp("CINT1-E-NOPF-ALL",trigger)) return " #1835 #2726";
-    else AliError(Form("Unknown trigger: %s", trigger));
+    //    else AliError(Form("Unknown trigger: %s", trigger));
     
   } 
   else if (runNumber >= 130148 && runNumber <= 130375) {
@@ -639,16 +719,37 @@ const char * AliPhysicsSelection::GetBXIDs(UInt_t runNumber, const char * trigge
     // Printf("0x%x",returnString.Data());
     // Printf("%s",returnString.Data());
     return returnString.Data();
+  } 
+  else if (runNumber >= 130601 && runNumber <= 130640) {
+    TString triggerString = trigger;
+    static TString returnString = " ";
+    returnString = "";
+    if (triggerString.Contains("B")) returnString += "  #346  #386  #426  #466  #506  #546  #586  #1240  #1280  #1320  #1360  #1400  #1440  #1480 ";
+    if (triggerString.Contains("A")) returnString += "  #626  #666  #706  #746  #786  #826  #866  #1520  #1560  #1600  #1640  #1680  #1720  #1760  #2076  #2131  #2171  #2211  #2251  #2291  #2331  #2371  #2414  #2454  #2494  #2534  #2574  #2614  #2654  #2694  #2734  #2774  #2814 "; //#2854  #2894  #2934 not present in this run
+    if (triggerString.Contains("C")) returnString += "  #3019  #3059  #3099  #3139  #3179  #3219  #3259  #3299  #3339  #3379  #3419  #3459  #3499  #3539  #115  #629  #669  #709  #749  #789  #829  #869  #909  #949  #989  #1029  #1069  #1109  #1149  #1523  #1563  #1603  #1643 "; //#1683  #1723  #1763 not present in this run
+    return returnString.Data();
   }
 
   else {
-    AliError(Form("Unknown run %d, using all BXs!",runNumber));
+    AliWarning(Form("Unknown run %d, using all BXs!",runNumber));
   }
 
   return "";
 }
-    
-Bool_t AliPhysicsSelection::Initialize(Int_t runNumber)
+
+Bool_t AliPhysicsSelection::Initialize(const AliESDEvent* aEsd)
+{
+  // initializes the object for the given ESD
+  
+  AliInfo(Form("Initializing for beam type: %s", aEsd->GetESDRun()->GetBeamType()));
+  Bool_t pp = kTRUE;
+  if (strcmp(aEsd->GetESDRun()->GetBeamType(), "Pb-Pb") == 0)
+    pp = kFALSE;
+  
+  return Initialize(aEsd->GetRunNumber(), pp);
+}
+
+Bool_t AliPhysicsSelection::Initialize(Int_t runNumber, Bool_t pp)
 {
   // initializes the object for the given run
   // TODO having the run number here and parameters hardcoded is clearly temporary, a way needs to be found to have a CDB-like configuration also for analysis
@@ -673,15 +774,13 @@ Bool_t AliPhysicsSelection::Initialize(Int_t runNumber)
     AliFatal("Cannot process several runs because BG computation is requested");
 
   if(fComputeBG && !fUseBXNumbers) 
-    AliFatal("Cannot compute BG id BX numbers are not used");
+    AliFatal("Cannot compute BG if BX numbers are not used");
   
   if(fUseBXNumbers && fFillingScheme != "" && fFillingScheme != GetFillingScheme(runNumber))
     AliFatal("Cannot process runs with different filling scheme if usage of BX numbers is requested");
 
   fFillingScheme      = GetFillingScheme(runNumber);
 
-  if(fComputeBG) SetBIFactors(runNumber);
-
   AliInfo(Form("Initializing for run %d", runNumber));
   
   // initialize first time?
@@ -690,55 +789,98 @@ Bool_t AliPhysicsSelection::Initialize(Int_t runNumber)
     if (fUsingCustomClasses) {
       AliInfo("Using user-provided trigger classes");
     } else {
-      switch (triggerScheme)
+      if (pp)
       {
-      case 0:
-        fCollTrigClasses.Add(new TObjString(Form("&%u", (UInt_t) AliVEvent::kMB)));
-        break;
-        
-      case 1:
-       // trigger classes used before August 2010
-        fCollTrigClasses.Add(new TObjString(Form("%s%s &%u","+CINT1B-ABCE-NOPF-ALL",  GetBXIDs(runNumber,"CINT1B-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMB)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CINT1A-ABCE-NOPF-ALL",  GetBXIDs(runNumber,"CINT1A-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMB)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CINT1C-ABCE-NOPF-ALL",  GetBXIDs(runNumber,"CINT1C-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMB)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CINT1-E-NOPF-ALL",      GetBXIDs(runNumber,"CINT1-E-NOPF-ALL"), (UInt_t) AliVEvent::kMB)));
-
-        // Muon trigger have the same BXIDs of the corresponding CINT triggers
-        fCollTrigClasses.Add(new TObjString(Form("%s%s &%u","+CMUS1B-ABCE-NOPF-MUON",  GetBXIDs(runNumber,"CINT1B-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMUON)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CMUS1A-ABCE-NOPF-MUON",  GetBXIDs(runNumber,"CINT1A-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMUON)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CMUS1C-ABCE-NOPF-MUON",  GetBXIDs(runNumber,"CINT1C-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMUON)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CMUS1-E-NOPF-MUON"    ,  GetBXIDs(runNumber,"CINT1-E-NOPF-ALL"), (UInt_t) AliVEvent::kMUON)));
-        
-        // triggers classes used from August 2010
-        // MB
-        fCollTrigClasses.Add(new TObjString(Form("%s%s &%u", "+CINT1-B-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "B"),  (UInt_t) AliVEvent::kMB)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CINT1-AC-NOPF-ALLNOTRD", GetBXIDs(runNumber, "AC"), (UInt_t) AliVEvent::kMB)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CINT1-E-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "E"),  (UInt_t) AliVEvent::kMB)));
-                                                                                     
-       // MUON                                                                       
-        fCollTrigClasses.Add(new TObjString(Form("%s%s &%u", "+CMUS1-B-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "B"),  (UInt_t) AliVEvent::kMUON)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CMUS1-AC-NOPF-ALLNOTRD", GetBXIDs(runNumber, "AC"), (UInt_t) AliVEvent::kMUON)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CMUS1-E-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "E"),  (UInt_t) AliVEvent::kMUON)));
-                                                                                    
-       // High Multiplicity                                                         
-        fCollTrigClasses.Add(new TObjString(Form("%s%s &%u", "+CSH1-B-NOPF-ALLNOTRD"  , GetBXIDs(runNumber, "B"),  (UInt_t) AliVEvent::kHighMult)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CSH1-AC-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "AC"), (UInt_t) AliVEvent::kHighMult)));
-        fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CSH1-E-NOPF-ALLNOTRD"  , GetBXIDs(runNumber, "E"),  (UInt_t) AliVEvent::kHighMult)));
-
-        break;
-        
-      case 2:
-        fCollTrigClasses.Add(new TObjString(Form("+CSMBB-ABCE-NOPF-ALL &%u", (UInt_t) AliVEvent::kMB)));
-        fBGTrigClasses.Add(new TObjString(Form("+CSMBA-ABCE-NOPF-ALL -CSMBB-ABCE-NOPF-ALL &%u", (UInt_t) AliVEvent::kMB)));
-        fBGTrigClasses.Add(new TObjString(Form("+CSMBC-ABCE-NOPF-ALL -CSMBB-ABCE-NOPF-ALL &%u", (UInt_t) AliVEvent::kMB)));
-        break;
+        switch (triggerScheme)
+        {
+        case 0:
+          // MC Proton-Proton
+          
+          fCollTrigClasses.Add(new TObjString(Form("&%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCINT1)));
+          break;
+          
+        case 1:
+          // Proton-Proton
+          
+          // trigger classes used before August 2010
+          fCollTrigClasses.Add(new TObjString(Form("%s%s &%u","+CINT1B-ABCE-NOPF-ALL",  GetBXIDs(runNumber,"CINT1B-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMB)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CINT1A-ABCE-NOPF-ALL",  GetBXIDs(runNumber,"CINT1A-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMB)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CINT1C-ABCE-NOPF-ALL",  GetBXIDs(runNumber,"CINT1C-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMB)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CINT1-E-NOPF-ALL",      GetBXIDs(runNumber,"CINT1-E-NOPF-ALL"), (UInt_t) AliVEvent::kMB)));
+  
+          // Muon trigger have the same BXIDs of the corresponding CINT triggers
+          fCollTrigClasses.Add(new TObjString(Form("%s%s &%u","+CMUS1B-ABCE-NOPF-MUON",  GetBXIDs(runNumber,"CINT1B-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMUON)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CMUS1A-ABCE-NOPF-MUON",  GetBXIDs(runNumber,"CINT1A-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMUON)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CMUS1C-ABCE-NOPF-MUON",  GetBXIDs(runNumber,"CINT1C-ABCE-NOPF-ALL"), (UInt_t) AliVEvent::kMUON)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u","+CMUS1-E-NOPF-MUON"    ,  GetBXIDs(runNumber,"CINT1-E-NOPF-ALL"), (UInt_t) AliVEvent::kMUON)));
+          
+          // triggers classes used from August 2010
+          // MB
+          fCollTrigClasses.Add(new TObjString(Form("%s%s &%u", "+CINT1-B-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "B"),  (UInt_t) AliVEvent::kMB)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CINT1-AC-NOPF-ALLNOTRD", GetBXIDs(runNumber, "AC"), (UInt_t) AliVEvent::kMB)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CINT1-E-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "E"),  (UInt_t) AliVEvent::kMB)));
+                                                                                        
+          // MUON                                                                            
+          fCollTrigClasses.Add(new TObjString(Form("%s%s &%u", "+CMUS1-B-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "B"),  (UInt_t) AliVEvent::kMUON)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CMUS1-AC-NOPF-ALLNOTRD", GetBXIDs(runNumber, "AC"), (UInt_t) AliVEvent::kMUON)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CMUS1-E-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "E"),  (UInt_t) AliVEvent::kMUON)));
+                                                                                      
+          // High Multiplicity                                                      
+          fCollTrigClasses.Add(new TObjString(Form("%s%s &%u", "+CSH1-B-NOPF-ALLNOTRD"  , GetBXIDs(runNumber, "B"),  (UInt_t) AliVEvent::kHighMult)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CSH1-AC-NOPF-ALLNOTRD" , GetBXIDs(runNumber, "AC"), (UInt_t) AliVEvent::kHighMult)));
+          fBGTrigClasses.Add  (new TObjString(Form("%s%s &%u", "+CSH1-E-NOPF-ALLNOTRD"  , GetBXIDs(runNumber, "E"),  (UInt_t) AliVEvent::kHighMult)));
+  
+          // WARNING: IF YOU ADD MORE TRIGGER CLASSES, PLEASE CHECK THAT THE REGULAR EXPRESSION IN GetStatRow IS STILL VALID
+  
+          break;
+          
+        case 2:
+          // Proton-Proton
+          
+          fCollTrigClasses.Add(new TObjString(Form("+CSMBB-ABCE-NOPF-ALL &%u", (UInt_t) AliVEvent::kMB)));
+          fBGTrigClasses.Add(new TObjString(Form("+CSMBA-ABCE-NOPF-ALL -CSMBB-ABCE-NOPF-ALL &%u", (UInt_t) AliVEvent::kMB)));
+          fBGTrigClasses.Add(new TObjString(Form("+CSMBC-ABCE-NOPF-ALL -CSMBB-ABCE-NOPF-ALL &%u", (UInt_t) AliVEvent::kMB)));
+          break;
+          
+        default:
+          AliFatal(Form("Unsupported trigger scheme %d", triggerScheme));
+        }
+      }
+      else
+      {
+        switch (triggerScheme)
+        {
+        case 0:
+          // MC Heavy-Ion
+          
+          fCollTrigClasses.Add(new TObjString(Form("&%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2A)));
+          fCollTrigClasses.Add(new TObjString(Form("&%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2C)));
+          fCollTrigClasses.Add(new TObjString(Form("&%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBAC)));
+          break;
         
-      case 3:
-        // 
-        break;
+        case 1:
+          // Data Heavy-ion
+          
+          fCollTrigClasses.Add(new TObjString(Form("+CMBS2A-B-NOPF-ALL &%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2A)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBS2A-A-NOPF-ALL &%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2A)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBS2A-C-NOPF-ALL &%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2A)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBS2A-E-NOPF-ALL &%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2A)));
+          
+          fCollTrigClasses.Add(new TObjString(Form("+CMBS2C-B-NOPF-ALL &%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2C)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBS2C-A-NOPF-ALL &%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2C)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBS2C-C-NOPF-ALL &%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2C)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBS2C-E-NOPF-ALL &%u *%d", (UInt_t) AliVEvent::kMB, (Int_t) kCMBS2C)));
+          
+          fCollTrigClasses.Add(new TObjString(Form("+CMBAC-B-NOPF-ALL &%u *%d",  (UInt_t) AliVEvent::kMB, (Int_t) kCMBAC)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBAC-A-NOPF-ALL &%u *%d",  (UInt_t) AliVEvent::kMB, (Int_t) kCMBAC)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBAC-C-NOPF-ALL &%u *%d",  (UInt_t) AliVEvent::kMB, (Int_t) kCMBAC)));
+          fBGTrigClasses.Add  (new TObjString(Form("+CMBAC-E-NOPF-ALL &%u *%d",  (UInt_t) AliVEvent::kMB, (Int_t) kCMBAC)));
+          
+          break;
         
-      default:
-        AliFatal(Form("Unsupported trigger scheme %d", triggerScheme));
+        default:
+          AliFatal(Form("Unsupported trigger scheme %d", triggerScheme));
+        }
       }
     }
     
@@ -750,6 +892,7 @@ Bool_t AliPhysicsSelection::Initialize(Int_t runNumber)
       triggerAnalysis->SetAnalyzeMC(fMC);
       triggerAnalysis->EnableHistograms();
       triggerAnalysis->SetSPDGFOThreshhold(1);
+      triggerAnalysis->SetDoFMD(kFALSE);
       fTriggerAnalysis.Add(triggerAnalysis);
     }
       
@@ -836,9 +979,9 @@ TH2F * AliPhysicsSelection::BookHistStatistics(const char * tag) {
 
   Int_t count = fCollTrigClasses.GetEntries() + fBGTrigClasses.GetEntries();
 #ifdef VERBOSE_STAT
-  Int_t extrarows = fComputeBG ? 8 : 0;
+  Int_t extrarows = fComputeBG != 0 ? 8 : 0;
 #else
-  Int_t extrarows = fComputeBG ? 3 : 0;
+  Int_t extrarows = fComputeBG != 0 ? 3 : 0;
 #endif
   TH2F * h = new TH2F(Form("fHistStatistics%s",tag), Form("fHistStatistics - %s ;;",tag), kStatAccepted, 0.5, kStatAccepted+0.5, count+extrarows, -0.5, -0.5 + count+extrarows);
 
@@ -846,18 +989,21 @@ TH2F * AliPhysicsSelection::BookHistStatistics(const char * tag) {
   h->GetXaxis()->SetBinLabel(kStatHWTrig,       "Hardware trigger");
   h->GetXaxis()->SetBinLabel(kStatFO1,          "FO >= 1");
   h->GetXaxis()->SetBinLabel(kStatFO2,          "FO >= 2");
+  h->GetXaxis()->SetBinLabel(kStatFO2L1,         "FO (L1) >= 2");
   h->GetXaxis()->SetBinLabel(kStatV0A,          "V0A");
   h->GetXaxis()->SetBinLabel(kStatV0C,          "V0C");
   h->GetXaxis()->SetBinLabel(kStatFMD,          "FMD");
-  h->GetXaxis()->SetBinLabel(kStatSSD1,                 "SSD >= 2");
   h->GetXaxis()->SetBinLabel(kStatV0ABG,        "V0A BG");
   h->GetXaxis()->SetBinLabel(kStatV0CBG,        "V0C BG");
+  h->GetXaxis()->SetBinLabel(kStatZDCA,          "ZDCA");
+  h->GetXaxis()->SetBinLabel(kStatZDCC,          "ZDCC");
+  h->GetXaxis()->SetBinLabel(kStatZDCAC,         "ZDCA & ZDCC");
   h->GetXaxis()->SetBinLabel(kStatMB1,          "(FO >= 1 | V0A | V0C) & !V0 BG");
   h->GetXaxis()->SetBinLabel(kStatMB1Prime,      "(FO >= 2 | (FO >= 1 & (V0A | V0C)) | (V0A &v0C) ) & !V0 BG");
-  h->GetXaxis()->SetBinLabel(kStatFO1AndV0,     "FO >= 1 & (V0A | V0C) & !V0 BG");
+  //h->GetXaxis()->SetBinLabel(kStatFO1AndV0,   "FO >= 1 & (V0A | V0C) & !V0 BG");
   h->GetXaxis()->SetBinLabel(kStatV0,           "V0A & V0C & !V0 BG & !BG ID");
   h->GetXaxis()->SetBinLabel(kStatOffline,      "Offline Trigger");
-  h->GetXaxis()->SetBinLabel(kStatAny2Hits,     "2 Hits & !V0 BG");
+  //h->GetXaxis()->SetBinLabel(kStatAny2Hits,   "2 Hits & !V0 BG");
   h->GetXaxis()->SetBinLabel(kStatBG,           "Background identification");
   h->GetXaxis()->SetBinLabel(kStatAccepted,      "Accepted");
 
@@ -874,7 +1020,8 @@ TH2F * AliPhysicsSelection::BookHistStatistics(const char * tag) {
     }
 
   if(fComputeBG) {
-    h->GetYaxis()->SetBinLabel(n++, "BG (A+C)");
+    fBGStatOffset = n;
+    h->GetYaxis()->SetBinLabel(n++, Form("BG (A+C) (Mask [0x%x])", fComputeBG));
     h->GetYaxis()->SetBinLabel(n++, "ACC");
 #ifdef VERBOSE_STAT
     h->GetYaxis()->SetBinLabel(n++, "BG (A+C) %  (rel. to CINT1B)");
@@ -889,11 +1036,12 @@ TH2F * AliPhysicsSelection::BookHistStatistics(const char * tag) {
   return h;
 }
 
-void AliPhysicsSelection::Print(Option_t* /* option */) const
+void AliPhysicsSelection::Print(Option_t *option) const
 {
   // print the configuration
-  
+  TString msg;
   Printf("Configuration initialized for run %d (MC: %d):", fCurrentRun, fMC);
+  msg += Form("Configuration initialized for run %d (MC: %d):\n", fCurrentRun, fMC);
   
   Printf("Collision trigger classes:");
   for (Int_t i=0; i < fCollTrigClasses.GetEntries(); i++)
@@ -920,15 +1068,19 @@ void AliPhysicsSelection::Print(Option_t* /* option */) const
     for (Int_t i=0; i<fCollTrigClasses.GetEntries(); i++)
     {
       Printf("\nSelection statistics for collision trigger %s:", ((TObjString*) fCollTrigClasses.At(i))->String().Data());
+      msg += Form("\nSelection statistics for collision trigger %s:\n", ((TObjString*) fCollTrigClasses.At(i))->String().Data());
       
       Printf("Total events with correct trigger class: %d", (Int_t) fHistStatistics[kStatIdxAll]->GetBinContent(1, i+1));
+      msg += Form("Total events with correct trigger class: %d\n", (Int_t) fHistStatistics[kStatIdxAll]->GetBinContent(1, i+1));
       Printf("Selected collision candidates: %d", (Int_t) fHistStatistics[kStatIdxAll]->GetBinContent(fHistStatistics[kStatIdxAll]->GetXaxis()->FindBin("Accepted"), i+1));
+      msg += Form("Selected collision candidates: %d\n", (Int_t) fHistStatistics[kStatIdxAll]->GetBinContent(fHistStatistics[kStatIdxAll]->GetXaxis()->FindBin("Accepted"), i+1));
     }
   }
   
   if (fHistBunchCrossing)
   {
     Printf("\nBunch crossing statistics:");
+    msg += "\nBunch crossing statistics:\n";
     
     for (Int_t i=1; i<=fHistBunchCrossing->GetNbinsY(); i++)
     {
@@ -938,8 +1090,10 @@ void AliPhysicsSelection::Print(Option_t* /* option */) const
       for (Int_t j=1; j<=fHistBunchCrossing->GetNbinsX(); j++)
         if (fHistBunchCrossing->GetBinContent(j, i) > 0)
           str += Form("%d, ", (Int_t) fHistBunchCrossing->GetXaxis()->GetBinCenter(j));
-       
+             
       Printf("%s", str.Data());
+      msg += str;
+      msg += "\n";
     }
     
     for (Int_t j=1; j<=fHistBunchCrossing->GetNbinsX(); j++)
@@ -969,7 +1123,12 @@ void AliPhysicsSelection::Print(Option_t* /* option */) const
     Printf("WARNING: Ignoring V0 information in selection");
   if(!fBin0CallBack) 
     Printf("WARNING: Callback not set: will not fill the statistics for the bin 0");
-
+  TString opt(option);
+  opt.ToUpper();
+  if (opt == "STAT") {
+     AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
+     if (mgr) mgr->AddStatisticsMsg(msg);
+  }
 }
 
 Long64_t AliPhysicsSelection::Merge(TCollection* list)
@@ -1004,11 +1163,20 @@ Long64_t AliPhysicsSelection::Merge(TCollection* list)
     Int_t currentRun = entry->GetCurrentRun();
     // Nothing to merge with since run number was not initialized.
     if (currentRun < 0) continue;
-    if (fCurrentRun < 0) fCurrentRun = currentRun;
+    if (fCurrentRun < 0) 
+    {
+      fCurrentRun = currentRun;
+      fMC = entry->fMC;
+      for (Int_t i=0; i<entry->fCollTrigClasses.GetEntries(); i++)
+        fCollTrigClasses.Add(entry->fCollTrigClasses.At(i)->Clone());
+      for (Int_t i=0; i<entry->fBGTrigClasses.GetEntries(); i++)
+        fBGTrigClasses.Add(entry->fBGTrigClasses.At(i)->Clone());
+    }
     if (fCurrentRun != currentRun)
        AliWarning(Form("Current run %d not matching the one to be merged with %d", fCurrentRun, currentRun));
     
-    collections[0].Add(&(entry->fTriggerAnalysis));
+    if (entry->fTriggerAnalysis.GetEntries() > 0)
+      collections[0].Add(&(entry->fTriggerAnalysis));
     if (entry->fHistStatistics[0])
       collections[1].Add(entry->fHistStatistics[0]);
     if (entry->fHistStatistics[1])
@@ -1023,15 +1191,54 @@ Long64_t AliPhysicsSelection::Merge(TCollection* list)
     count++;
   }
 
+  if (fTriggerAnalysis.GetEntries() == 0 && collections[0].GetEntries() > 0)
+  {
+    TList* firstList = (TList*) collections[0].First();
+    for (Int_t i=0; i<firstList->GetEntries(); i++)
+      fTriggerAnalysis.Add(firstList->At(i)->Clone());
+    
+    collections[0].RemoveAt(0);
+  }
   fTriggerAnalysis.Merge(&collections[0]);
+  
+  // if this instance is empty (not initialized) nothing would be merged here --> copy first entry
+  if (!fHistStatistics[0] && collections[1].GetEntries() > 0)
+  {
+    fHistStatistics[0] = (TH2F*) collections[1].First()->Clone();
+    collections[1].RemoveAt(0);
+  }
   if (fHistStatistics[0])
     fHistStatistics[0]->Merge(&collections[1]);
+    
+  if (!fHistStatistics[1] && collections[2].GetEntries() > 0)
+  {
+    fHistStatistics[1] = (TH2F*) collections[2].First()->Clone();
+    collections[2].RemoveAt(0);
+  }
   if (fHistStatistics[1])
     fHistStatistics[1]->Merge(&collections[2]);
+    
+  if (!fHistBunchCrossing && collections[3].GetEntries() > 0)
+  {
+    fHistBunchCrossing = (TH2F*) collections[3].First()->Clone();
+    collections[3].RemoveAt(0);
+  }
   if (fHistBunchCrossing)
     fHistBunchCrossing->Merge(&collections[3]);
+  
+  if (!fHistTriggerPattern && collections[4].GetEntries() > 0)
+  {
+    fHistTriggerPattern = (TH1F*) collections[4].First()->Clone();
+    collections[4].RemoveAt(0);
+  }
   if (fHistTriggerPattern)
     fHistTriggerPattern->Merge(&collections[4]);
+  
+  if (!fBackgroundIdentification && collections[5].GetEntries() > 0)
+  {
+    fBackgroundIdentification = (AliAnalysisCuts*) collections[5].First()->Clone();
+    collections[5].RemoveAt(0);
+  }
   if (fBackgroundIdentification)
     fBackgroundIdentification->Merge(&collections[5]);
   
@@ -1061,86 +1268,142 @@ void AliPhysicsSelection::SaveHistograms(const char* folder) const
       AliWarning("BG estimate only supported for trigger scheme \"1\" (CINT1 suite)");
     } else if (fUseMuonTriggers) {
       AliWarning("BG estimate with muon triggers to be implemented");
-    } else {
+    } else {      
+      AliInfo("BG estimate assumes that for a given run you only have A and C triggers separately or"
+             " toghether as a AC class! Make sure this assumption holds in your case"); 
+      
+      // use an anum for the different trigger classes, to make loops easier to read
+      enum {kClassB =0 , kClassA, kClassC, kClassAC, kClassE, kNClasses};
+      const char * classFlags[] = {"B", "A", "C", "AC", "E"}; // labels
+
+      UInt_t * rows[kNClasses] = {0}; // Array of matching rows
+      Int_t nrows[kNClasses] = {0};
+      // Get rows matching the requested trigger bits for all trigger classes
+      for(Int_t iTrigClass = 0; iTrigClass < kNClasses; iTrigClass++){
+       nrows[iTrigClass] = GetStatRow(classFlags[iTrigClass],fComputeBG,&rows[iTrigClass]);    
+      }
+
       // 0. Determine the ratios of triggers E/B, A/B, C/B from the stat histogram
       // Those are used to rescale the different classes to the same number of bx ids
-      // TODO: pass names of the rows for B, CA and E and look names of the rows. How do I handle the case in which both AC are in the same row?
-      Float_t nB = 0;
-      Float_t nC = 0;
-      Float_t nA = 0;
-      Float_t nE = 0;
-      for (Int_t j=1; j<=fHistBunchCrossing->GetNbinsX(); j++) {
-       if (fHistBunchCrossing->GetBinContent(j, 1) > 0) nB++;
-       if (fHistBunchCrossing->GetBinContent(j, 2) > 0) nA++;
-       if (fHistBunchCrossing->GetBinContent(j, 3) > 0) nC++;
-       if (fHistBunchCrossing->GetBinContent(j, 4) > 0) nE++;
+      // TODO: pass names of the rows for B, CA and E and look names of the rows. How do I handle the case in which both AC are in the same row?         
+      Int_t nBXIds[kNClasses] = {0};
+      cout <<"Computing BG:" << endl;
+      
+      for(Int_t iTrigClass = 0; iTrigClass < kNClasses; iTrigClass++){
+       for(Int_t irow = 0; irow < nrows[iTrigClass]; irow++) {
+         if(irow==0) cout << "- Class " << classFlags[iTrigClass] << endl;   
+         for (Int_t j=1; j<=fHistBunchCrossing->GetNbinsX(); j++) {
+           if (fHistBunchCrossing->GetBinContent(j, rows[iTrigClass][irow]) > 0) {
+             nBXIds[iTrigClass]++;      
+           }
+         }
+         if(nBXIds[iTrigClass]>0) cout << "   Using row " << rows[iTrigClass][irow] <<  ": " 
+                                       << fHistBunchCrossing->GetYaxis()->GetBinLabel(rows[iTrigClass][irow]) 
+                                       << " (nBXID "<< nBXIds[iTrigClass] << ")"<< endl;
+
+       }
+
       }
-      Float_t ratioBE = nB/nE;
-      Float_t ratioBA = nB/nA;
-      Float_t ratioBC = nB/nC;
+
+      Float_t ratioToB[kNClasses];
+      ratioToB[kClassE]  = nBXIds[kClassE]  >0 ? Float_t(nBXIds[kClassB])/nBXIds[kClassE]   : 0;
+      ratioToB[kClassA]  = nBXIds[kClassA]  >0 ? Float_t(nBXIds[kClassB])/nBXIds[kClassA]   : 0;
+      ratioToB[kClassC]  = nBXIds[kClassC]  >0 ? Float_t(nBXIds[kClassB])/nBXIds[kClassC]   : 0;
+      ratioToB[kClassAC] = nBXIds[kClassAC] >0 ? Float_t(nBXIds[kClassB])/nBXIds[kClassAC]  : 0;
       Printf("Ratio between the BX ids in the different trigger classes:");
-      Printf("  B/E = %f",ratioBE);
-      Printf("  B/A = %f",ratioBA);
-      Printf("  B/C = %f",ratioBC);
+      Printf("  B/E  = %d/%d = %f", nBXIds[kClassB],nBXIds[kClassE], ratioToB[kClassE] );
+      Printf("  B/A  = %d/%d = %f", nBXIds[kClassB],nBXIds[kClassA], ratioToB[kClassA] );
+      Printf("  B/C  = %d/%d = %f", nBXIds[kClassB],nBXIds[kClassC], ratioToB[kClassC] );
+      Printf("  B/AC = %d/%d = %f", nBXIds[kClassB],nBXIds[kClassAC],ratioToB[kClassAC]);
       Int_t nHistStat = 2;
-      // TODO: get number of rows in a more flexible way
-      // 1. loop over all cols
 
+      // 1. loop over all cols
       for(Int_t iHistStat = 0; iHistStat < nHistStat; iHistStat++){
-    
        Int_t ncol = fHistStatistics[iHistStat]->GetNbinsX();
-       Float_t good1 = 0;
+       Float_t good1 = 0;      
        for(Int_t icol = 1; icol <= ncol; icol++) {
-         Int_t cint1B = (Int_t) fHistStatistics[iHistStat]->GetBinContent(icol,1);     
-         Int_t cint1A = (Int_t) fHistStatistics[iHistStat]->GetBinContent(icol,2);     
-         Int_t cint1C = (Int_t) fHistStatistics[iHistStat]->GetBinContent(icol,3);     
-         Int_t cint1E = (Int_t) fHistStatistics[iHistStat]->GetBinContent(icol,4);      
-      
-         if (cint1B>0) {
-           Int_t acc  = ratioBE*cint1E; 
-           Double_t acc_err = TMath::Sqrt(ratioBE*ratioBE*cint1E);
+         Int_t nEvents[kNClasses] = {0}; // number of events should be reset at every column
+         // For all trigger classes, add up over row matching trigger mask (as selected before)
+         for(Int_t iTrigClass = 0; iTrigClass < kNClasses; iTrigClass++){
+           for(Int_t irow = 0; irow < nrows[iTrigClass]; irow++) {       
+             nEvents[iTrigClass] += (Int_t) fHistStatistics[iHistStat]->GetBinContent(icol,rows[iTrigClass][irow]);    
+           }
+           //      cout << "Events " << classFlags[iTrigClass] << " ("<<icol<<") " << nEvents[iTrigClass] << endl;         
+         }
+         if (nEvents[kClassB]>0) {
+           Float_t acc  = ratioToB[kClassE]*nEvents[kClassE]; 
+           Double_t acc_err = TMath::Sqrt(ratioToB[kClassE]*ratioToB[kClassE]*nEvents[kClassE]);
            //      Int_t bg   = cint1A + cint1C - 2*acc;
-           Float_t bg   = fBIFactorA*(ratioBA*cint1A-acc) + fBIFactorC*(ratioBC*cint1C-acc) ;
-           Float_t good = Float_t(cint1B) - bg - acc;
+           
+            // Assuming that for a given class the triggers are either recorded as A+C or AC
+           Float_t bg   = nEvents[kClassAC] > 0 ?
+             fBIFactorAC*(ratioToB[kClassAC]*nEvents[kClassAC] - 2*acc):
+             fBIFactorA* (ratioToB[kClassA]*nEvents[kClassA]-acc) + 
+             fBIFactorC* (ratioToB[kClassC]*nEvents[kClassC]-acc) ;
+
+           // cout << "-----------------------" << endl;
+           // cout << "Factors: " << fBIFactorA << " " << fBIFactorC << " " << fBIFactorAC << endl;
+           // cout << "Ratios: "  << ratioToB[kClassA] << " " << ratioToB[kClassC] << " " << ratioToB[kClassAC] << endl;
+           // cout << "Evts:   "  << nEvents[kClassA] << " " << nEvents[kClassC] << " " << nEvents[kClassAC] << " " <<  nEvents[kClassB] << endl;
+           // cout << "Acc: " << acc << endl;
+           // cout << "BG: " << bg << endl;
+           // cout  << "  " <<   fBIFactorA* (ratioToB[kClassA]*nEvents[kClassA]-acc) <<endl;
+           // cout  << "  " <<   fBIFactorC* (ratioToB[kClassC]*nEvents[kClassC]-acc) <<endl;
+           // cout  << "  " <<   fBIFactorAC*(ratioToB[kClassAC]*nEvents[kClassAC] - 2*acc) << endl;
+           // cout << "-----------------------" << endl;
+
+           Float_t good = Float_t(nEvents[kClassB]) - bg - acc;
            if (icol ==1) good1 = good;
-           //      Float_t errGood     = TMath::Sqrt(2*(cint1A+cint1C+cint1E));// Error on the number of goods assuming only bg fluctuates
+           //      Float_t errGood     = TMath::Sqrt(2*(nEvents[kClassA]+nEvents[kClassC]+nEvents[kClassE]));// Error on the number of goods assuming only bg fluctuates
            //      DeltaG^2 = B + FA^2 A + FC^2 C + Ratio^2 (FA+FC-1)^2 E.
-           Float_t errGood     = TMath::Sqrt( cint1B + 
-                                              fBIFactorA*fBIFactorA*ratioBA*ratioBA*cint1A +
-                                              fBIFactorC*fBIFactorC*ratioBC*ratioBC*cint1C +
-                                              ratioBE * ratioBE * 
-                                              (fBIFactorA + fBIFactorC - 1)*(fBIFactorA + fBIFactorC - 1)*cint1E);
-           Float_t errBG = TMath::Sqrt(fBIFactorA*fBIFactorA*ratioBA*ratioBA*cint1A+
-                                       fBIFactorC*fBIFactorC*ratioBC*ratioBC*cint1C+
-                                       ratioBE*ratioBE*(fBIFactorA+fBIFactorC)*(fBIFactorA+fBIFactorC)*cint1E);
+           Float_t errGood     = nEvents[kClassAC] > 0 ? 
+             TMath::Sqrt( nEvents[kClassB] +
+                          fBIFactorAC*fBIFactorAC*ratioToB[kClassAC]*ratioToB[kClassAC]*nEvents[kClassAC] +
+                          ratioToB[kClassE] * ratioToB[kClassE] * 
+                          (fBIFactorAC - 1)*(fBIFactorAC - 1)*nEvents[kClassE]) :  
+             TMath::Sqrt( nEvents[kClassB] + 
+                          fBIFactorA*fBIFactorA*ratioToB[kClassA]*ratioToB[kClassA]*nEvents[kClassA] +
+                          fBIFactorC*fBIFactorC*ratioToB[kClassC]*ratioToB[kClassC]*nEvents[kClassC] +
+                          ratioToB[kClassE] * ratioToB[kClassE] * 
+                          (fBIFactorA + fBIFactorC - 1)*(fBIFactorA + fBIFactorC - 1)*nEvents[kClassE]);
+
+           Float_t errBG = nEvents[kClassAC] > 0 ? 
+             TMath::Sqrt(fBIFactorAC*fBIFactorAC*ratioToB[kClassAC]*ratioToB[kClassAC]*nEvents[kClassAC]+
+                         4*ratioToB[kClassE]*ratioToB[kClassE]*(fBIFactorAC*fBIFactorAC)*nEvents[kClassE]) :
+             TMath::Sqrt(fBIFactorA*fBIFactorA*ratioToB[kClassA]*ratioToB[kClassA]*nEvents[kClassA]+
+                         fBIFactorC*fBIFactorC*ratioToB[kClassC]*ratioToB[kClassC]*nEvents[kClassC]+
+                         ratioToB[kClassE]*ratioToB[kClassE]*(fBIFactorA+fBIFactorC)*(fBIFactorA+fBIFactorC)*nEvents[kClassE]);
        
        
-           fHistStatistics[iHistStat]->SetBinContent(icol,kStatRowBG,bg);      
-           fHistStatistics[iHistStat]->SetBinError  (icol,kStatRowBG,errBG);   
-           fHistStatistics[iHistStat]->SetBinContent(icol,kStatRowAcc,acc);    
-           fHistStatistics[iHistStat]->SetBinError  (icol,kStatRowAcc,acc_err);        
-           fHistStatistics[iHistStat]->SetBinContent(icol,kStatRowGood,good);    
-           fHistStatistics[iHistStat]->SetBinError  (icol,kStatRowGood,errGood);    
+           fHistStatistics[iHistStat]->SetBinContent(icol,fBGStatOffset+kStatRowBG,bg);        
+           fHistStatistics[iHistStat]->SetBinError  (icol,fBGStatOffset+kStatRowBG,errBG);     
+           fHistStatistics[iHistStat]->SetBinContent(icol,fBGStatOffset+kStatRowAcc,acc);      
+           fHistStatistics[iHistStat]->SetBinError  (icol,fBGStatOffset+kStatRowAcc,acc_err);  
+           fHistStatistics[iHistStat]->SetBinContent(icol,fBGStatOffset+kStatRowGood,good);    
+           fHistStatistics[iHistStat]->SetBinError  (icol,fBGStatOffset+kStatRowGood,errGood);    
 
 #ifdef VERBOSE_STAT
-           //kStatRowBG=5,kStatRowAcc,kStatRowBGFrac,kStatRowAccFrac,kStatRowErrGoodFrac,kStatRowGoodFrac,kStatRowGood,kStatRowErrGood
-           Float_t accFrac   = Float_t(acc) / cint1B  *100;
-           Float_t errAccFrac= Float_t(acc_err) / cint1B  *100;
-           Float_t bgFrac    = Float_t(bg)  / cint1B  *100;
+           //kStatRowBG=0,kStatRowAcc,kStatRowBGFrac,kStatRowAccFrac,kStatRowErrGoodFrac,kStatRowGoodFrac,kStatRowGood,kStatRowErrGood
+           Float_t accFrac   = Float_t(acc) / nEvents[kClassB]  *100;
+           Float_t errAccFrac= Float_t(acc_err) / nEvents[kClassB]  *100;
+           Float_t bgFrac    = Float_t(bg)  / nEvents[kClassB]  *100;
            Float_t goodFrac  = Float_t(good)  / good1 *100;
            Float_t errGoodFrac = errGood/good1 * 100;
-           Float_t errFracBG = bg > 0 ? TMath::Sqrt((errBG/bg)*(errBG/bg) + 1/cint1B)*bgFrac : 0;
-           fHistStatistics[iHistStat]->SetBinContent(icol,kStatRowBGFrac,bgFrac);      
-           fHistStatistics[iHistStat]->SetBinError  (icol,kStatRowBGFrac,errFracBG);   
-           fHistStatistics[iHistStat]->SetBinContent(icol,kStatRowAccFrac,accFrac);    
-           fHistStatistics[iHistStat]->SetBinError  (icol,kStatRowAccFrac,errAccFrac);    
-           fHistStatistics[iHistStat]->SetBinContent(icol,kStatRowGoodFrac,goodFrac);    
-           fHistStatistics[iHistStat]->SetBinContent(icol,kStatRowErrGoodFrac,errGoodFrac);    
-           fHistStatistics[iHistStat]->SetBinContent(icol,kStatRowErrGood,errGood);    
+           Float_t errFracBG = bg > 0 ? TMath::Sqrt((errBG/bg)*(errBG/bg) + 1/nEvents[kClassB])*bgFrac : 0;
+           fHistStatistics[iHistStat]->SetBinContent(icol,fBGStatOffset+kStatRowBGFrac,bgFrac);        
+           fHistStatistics[iHistStat]->SetBinError  (icol,fBGStatOffset+kStatRowBGFrac,errFracBG);     
+           fHistStatistics[iHistStat]->SetBinContent(icol,fBGStatOffset+kStatRowAccFrac,accFrac);    
+           fHistStatistics[iHistStat]->SetBinError  (icol,fBGStatOffset+kStatRowAccFrac,errAccFrac);    
+           fHistStatistics[iHistStat]->SetBinContent(icol,fBGStatOffset+kStatRowGoodFrac,goodFrac);    
+           fHistStatistics[iHistStat]->SetBinContent(icol,fBGStatOffset+kStatRowErrGoodFrac,errGoodFrac);    
+           fHistStatistics[iHistStat]->SetBinContent(icol,fBGStatOffset+kStatRowErrGood,errGood);    
 #endif
          }
        }
       }
+      for (Int_t iTrigClass = 0; iTrigClass < kNClasses; iTrigClass++){
+       delete [] rows[iTrigClass];
+      }  
     }  
   }
 
@@ -1180,125 +1443,206 @@ void AliPhysicsSelection::SaveHistograms(const char* folder) const
     gDirectory->cd("..");
 }
 
-void AliPhysicsSelection::SetBIFactors(Int_t run) {
-
-  switch(run) {
-  case 104155:
-    fBIFactorA = 0.961912722908;
-    fBIFactorC = 1.04992336081;
-    break;
-  case 104157:
-    fBIFactorA = 0.947312854998;
-    fBIFactorC = 1.01599706417;
-    break;
-  case 104159:
-    fBIFactorA = 0.93659320151;
-    fBIFactorC = 0.98580804207;
-    break;
-  case 104160:
-    fBIFactorA = 0.929664189926;
-    fBIFactorC = 0.963467679851;
-    break;
-  case 104315:
-    fBIFactorA = 1.08939104979;
-    fBIFactorC = 0.931113921925;
-    break;
-  case 104316:
-    fBIFactorA = 1.08351880974;
-    fBIFactorC = 0.916068345845;
-    break;
-  case 104320:
-    fBIFactorA = 1.07669281245;
-    fBIFactorC = 0.876818744763;
-    break;
-  case 104321:
-    fBIFactorA = 1.00971079602;
-    fBIFactorC = 0.773781299076;
-    break;
-  case 104792:
-    fBIFactorA = 0.787215863962;
-    fBIFactorC = 0.778253173071;
-    break;
-  case 104793:
-    fBIFactorA = 0.692211363661;
-    fBIFactorC = 0.733152456667;
-    break;
-  case 104799:
-    fBIFactorA = 1.04027825161;
-    fBIFactorC = 1.00530825942;
-    break;
-  case 104800:
-    fBIFactorA = 1.05309910671;
-    fBIFactorC = 1.00376801855;
-    break;
-  case 104801:
-    fBIFactorA = 1.0531231922;
-    fBIFactorC = 0.992439666758;
-    break;
-  case 104802:
-    fBIFactorA = 1.04191478134;
-    fBIFactorC = 0.979368585208;
-    break;
-  case 104803:
-    fBIFactorA = 1.03121314094;
-    fBIFactorC = 0.973379962609;
-    break;
-  case 104824:
-    fBIFactorA = 0.969945926722;
-    fBIFactorC = 0.39549745806;
-    break;
-  case 104825:
-    fBIFactorA = 0.968627213937;
-    fBIFactorC = 0.310100412205;
-    break;
-  case 104841:
-    fBIFactorA = 0.991601393212;
-    fBIFactorC = 0.83762204722;
-    break;
-  case 104845:
-    fBIFactorA = 0.98040863886;
-    fBIFactorC = 0.694824205793;
-    break;
-  case 104867:
-    fBIFactorA = 1.10646173412;
-    fBIFactorC = 0.841407246916;
-    break;
-  case 104876:
-    fBIFactorA = 1.12063452421;
-    fBIFactorC = 0.78726542895;
-    break;
-  case 104890:
-    fBIFactorA = 1.02346137453;
-    fBIFactorC = 1.03355663595;
-    break;
-  case 104892:
-    fBIFactorA = 1.05406025913;
-    fBIFactorC = 1.00029166135;
-    break;
-  case 105143:
-    fBIFactorA = 0.947343384349;
-    fBIFactorC = 0.972637444408;
-    break;
-  case 105160:
-    fBIFactorA = 0.908854622177;
-    fBIFactorC = 0.958851103977;
-    break; 
-  case 105256:
-    fBIFactorA = 0.810076150206;
-    fBIFactorC = 0.884663561883;
-    break;
-  case 105257:
-    fBIFactorA = 0.80974912303;
-    fBIFactorC = 0.878859123479;
-    break;
-  case 105268:
-    fBIFactorA = 0.809052110679;
-    fBIFactorC = 0.87233890989;
-    break;
-  default:
-    fBIFactorA = 1;
-    fBIFactorC = 1;
+Int_t AliPhysicsSelection::GetStatRow(const char * triggerBXClass, UInt_t offlineTriggerType, UInt_t ** rowIDs) const {
+  // Puts inside the array rowIDs the row number for a given offline
+  // trigger in a given bx class. Returns the total number of lines
+  // matching the selection
+  // triggerBXClass can be either "A", "AC", "B" or "E"
+  // offlineTriggerType is one of the types defined in AliVEvent
+  // User should delete rowIDs if no longer needed
+
+  if(!fHistStatistics[0]) {
+    AliWarning("Not initialized, returning 0");
+    return 0;
   }
+  const Int_t nrows = fHistStatistics[0]->GetNbinsY();
+
+  // allocate memory for at maximum nrows
+  Int_t nMatches = 0;
+  (*rowIDs) = new UInt_t[nrows];
+
+  // Build regular expression. look for a +, followed by the beginning
+  // of a word. Within the word, look for the class id after any
+  // number of any char, but at most one dash ("[^-]*-?"), followed by
+  // a - and then any char (".*") and at the class id ("\\&(\\d)")
+  // The class id is stored.
+  // WARNING: please check this if the trigger classes change
+  TPRegexp re(Form("\\+\\b[^-]*-?%s-.*\\&(\\d)",triggerBXClass));  
+  // Loop over rows and find matching ones:
+  for(Int_t irow = 1; irow <= nrows; irow++){
+    TObjArray * matches = re.MatchS(fHistStatistics[0]->GetYaxis()->GetBinLabel(irow));
+    if (matches->GetEntries()) {
+      TString s = ((TObjString*)matches->At(1))->GetString();      
+      if(UInt_t(s.Atoi()) & offlineTriggerType) { // bitwise comparison with the requested mask
+       //      cout << "Marching " << s.Data() << " " << offlineTriggerType << " " << fHistStatistics[0]->GetYaxis()->GetBinLabel(irow) << endl;       
+       (*rowIDs)[nMatches] = irow;
+       nMatches++;     
+      }
+    }
+    delete matches;
+  }
+  
+  return nMatches;
+}
 
+void AliPhysicsSelection::SetBIFactors(const AliESDEvent * aESD) {
+  // Set factors for realtive bunch intesities
+  if(!aESD) { 
+    AliFatal("ESD not given");
+  }
+  Int_t run = aESD->GetRunNumber();
+  if (run > 105268) {
+    // intensities stored in the ESDs
+    const AliESDRun* esdRun = aESD->GetESDRun();
+    Double_t intAB = esdRun->GetMeanIntensityIntecting(0);
+    Double_t intCB = esdRun->GetMeanIntensityIntecting(1);
+    Double_t intAA = esdRun->GetMeanIntensityNonIntecting(0);
+    Double_t intCC = esdRun->GetMeanIntensityNonIntecting(1);
+
+    // cout << "INT " <<intAB <<endl;
+    // cout << "INT " <<intCB <<endl;
+    // cout << "INT " <<intAA <<endl;
+    // cout << "INT " <<intCC <<endl;
+
+    if (intAB > -1 && intAA > -1) {
+      fBIFactorA = intAB/intAA;
+    } else {
+      AliWarning("Cannot set fBIFactorA, assuming 1");
+    }
+    
+    if (intCB > -1 && intCC > -1) {
+      fBIFactorC = intCB/intCC;
+    } else {
+      AliWarning("Cannot set fBIFactorC, assuming 1");
+    }
+      
+    if (intAB > -1 && intAA > -1 &&
+       intCB > -1 && intCC > -1) {
+      fBIFactorAC = (intAB+intCB)/(intAA+intCC);
+    } else {
+      AliWarning("Cannot set fBIFactorAC, assuming 1");
+    }
+        
+  }  
+  else {
+    // First runs. Intensities hardcoded
+    switch(run) {
+    case 104155:
+      fBIFactorA = 0.961912722908;
+      fBIFactorC = 1.04992336081;
+      break;
+    case 104157:
+      fBIFactorA = 0.947312854998;
+      fBIFactorC = 1.01599706417;
+      break;
+    case 104159:
+      fBIFactorA = 0.93659320151;
+      fBIFactorC = 0.98580804207;
+      break;
+    case 104160:
+      fBIFactorA = 0.929664189926;
+      fBIFactorC = 0.963467679851;
+      break;
+    case 104315:
+      fBIFactorA = 1.08939104979;
+      fBIFactorC = 0.931113921925;
+      break;
+    case 104316:
+      fBIFactorA = 1.08351880974;
+      fBIFactorC = 0.916068345845;
+      break;
+    case 104320:
+      fBIFactorA = 1.07669281245;
+      fBIFactorC = 0.876818744763;
+      break;
+    case 104321:
+      fBIFactorA = 1.00971079602;
+      fBIFactorC = 0.773781299076;
+      break;
+    case 104792:
+      fBIFactorA = 0.787215863962;
+      fBIFactorC = 0.778253173071;
+      break;
+    case 104793:
+      fBIFactorA = 0.692211363661;
+      fBIFactorC = 0.733152456667;
+      break;
+    case 104799:
+      fBIFactorA = 1.04027825161;
+      fBIFactorC = 1.00530825942;
+      break;
+    case 104800:
+      fBIFactorA = 1.05309910671;
+      fBIFactorC = 1.00376801855;
+      break;
+    case 104801:
+      fBIFactorA = 1.0531231922;
+      fBIFactorC = 0.992439666758;
+      break;
+    case 104802:
+      fBIFactorA = 1.04191478134;
+      fBIFactorC = 0.979368585208;
+      break;
+    case 104803:
+      fBIFactorA = 1.03121314094;
+      fBIFactorC = 0.973379962609;
+      break;
+    case 104824:
+      fBIFactorA = 0.969945926722;
+      fBIFactorC = 0.39549745806;
+      break;
+    case 104825:
+      fBIFactorA = 0.968627213937;
+      fBIFactorC = 0.310100412205;
+      break;
+    case 104841:
+      fBIFactorA = 0.991601393212;
+      fBIFactorC = 0.83762204722;
+      break;
+    case 104845:
+      fBIFactorA = 0.98040863886;
+      fBIFactorC = 0.694824205793;
+      break;
+    case 104867:
+      fBIFactorA = 1.10646173412;
+      fBIFactorC = 0.841407246916;
+      break;
+    case 104876:
+      fBIFactorA = 1.12063452421;
+      fBIFactorC = 0.78726542895;
+      break;
+    case 104890:
+      fBIFactorA = 1.02346137453;
+      fBIFactorC = 1.03355663595;
+      break;
+    case 104892:
+      fBIFactorA = 1.05406025913;
+      fBIFactorC = 1.00029166135;
+      break;
+    case 105143:
+      fBIFactorA = 0.947343384349;
+      fBIFactorC = 0.972637444408;
+      break;
+    case 105160:
+      fBIFactorA = 0.908854622177;
+      fBIFactorC = 0.958851103977;
+      break; 
+    case 105256:
+      fBIFactorA = 0.810076150206;
+      fBIFactorC = 0.884663561883;
+      break;
+    case 105257:
+      fBIFactorA = 0.80974912303;
+      fBIFactorC = 0.878859123479;
+      break;
+    case 105268:
+      fBIFactorA = 0.809052110679;
+      fBIFactorC = 0.87233890989;
+      break;
+    default:
+      fBIFactorA = 1;
+      fBIFactorC = 1;
+    }
+  }
 
 }