add setting for kind of trigger event for mixing

diff --git a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
index d2899537fcb29c1b715a056f5a6a5fc651bcd04f..570a98cd5e85dbba19825be49f7c78a2d377b79a 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
+++ b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
@@ -74,11 +74,11 @@ fFillCTS(0),                 fFillEMCAL(0),                   fFillPHOS(0),
 fFillEMCALCells(0),          fFillPHOSCells(0), 
 fRecalculateClusters(kFALSE),fSelectEmbeddedClusters(kFALSE),
 fTrackStatus(0),             fTrackFilterMask(0),             
-fESDtrackCuts(0),            fConstrainTrack(kFALSE),          fSelectHybridTracks(0),
+fESDtrackCuts(0),            fConstrainTrack(kFALSE),         fSelectHybridTracks(0),
 fTrackMult(0),               fTrackMultEtaCut(0.8),
 fReadStack(kFALSE),          fReadAODMCParticles(kFALSE), 
 fDeltaAODFileName(""),       fFiredTriggerClassName(""),      
-fEventTriggerMask(0),        fEventTriggerAtSE(0), 
+fEventTriggerMask(0),        fMixEventTriggerMask(0),         fEventTriggerAtSE(0), 
 fAnaLED(kFALSE),
 fTaskName(""),               fCaloUtils(0x0), 
 fMixedEvent(NULL),           fNMixedEvent(0),                 fVertex(NULL), 
@@ -351,6 +351,7 @@ void AliCaloTrackReader::InitParameters()
   fDeltaAODFileName      = "deltaAODPartCorr.root";
   fFiredTriggerClassName = "";
   fEventTriggerMask      = AliVEvent::kAny;
+  fMixEventTriggerMask   = AliVEvent::kAnyINT;
   fEventTriggerAtSE      = kTRUE; // Use only events that pass event selection at SE base class
   
   fAcceptFastCluster = kTRUE;
@@ -422,8 +423,8 @@ void AliCaloTrackReader::Print(const Option_t * opt) const
   printf("Write delta AOD =     %d\n",     fWriteOutputDeltaAOD) ;
   printf("Recalculate Clusters = %d\n",    fRecalculateClusters) ;
   
-  printf("Use Triggers selected in SE base class %d; If not what trigger Mask %d? \n", 
-         fEventTriggerAtSE, fEventTriggerMask);
+  printf("Use Triggers selected in SE base class %d; If not what trigger Mask? %d; Trigger max for mixed %d \n", 
+         fEventTriggerAtSE, fEventTriggerMask,fMixEventTriggerMask);
   
   if(fComparePtHardAndJetPt)
          printf("Compare jet pt and pt hard to accept event, factor = %2.2f",fPtHardAndJetPtFactor);
@@ -669,7 +670,7 @@ Bool_t AliCaloTrackReader::FillInputEvent(const Int_t iEntry,
     if(!inputHandler) return kFALSE ;  // to content coverity
     
     UInt_t isTrigger = inputHandler->IsEventSelected() & fEventTriggerMask;
-    UInt_t isMB      = inputHandler->IsEventSelected() & AliVEvent::kMB;
+    UInt_t isMB      = inputHandler->IsEventSelected() & fMixEventTriggerMask;
     
     if(fFillCTS && (isMB || isTrigger))
     {   

diff --git a/PWG/CaloTrackCorrBase/AliCaloTrackReader.h b/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
index a9481c187a266934f3404bad687ecea7cf06ba5b..6574fbcada2c4c47c5433029fd442a2b2f3b254b 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
+++ b/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
@@ -211,6 +211,11 @@ public:
   UInt_t           GetEventTriggerMask()             const { return fEventTriggerMask        ; }
   void             SetEventTriggerMaks(UInt_t evtTrig = AliVEvent::kAny) 
                                                            { fEventTriggerMask = evtTrig     ; }
+
+  UInt_t           GetMixEventTriggerMask()             const { return fMixEventTriggerMask  ; }
+  void             SetMixEventTriggerMaks(UInt_t evtTrig = AliVEvent::kAnyINT) 
+                                                           { fMixEventTriggerMask = evtTrig  ; }
+  
   
   Bool_t           IsEventTriggerAtSEOn()            const { return fEventTriggerAtSE        ; }
   void             SwitchOnEventTriggerAtSE()              { fEventTriggerAtSE      = kTRUE  ; }
@@ -437,6 +442,7 @@ public:
   TString          fFiredTriggerClassName;  // Name of trigger event type used to do the analysis
 
   UInt_t           fEventTriggerMask ;      // select this triggerered event
+  UInt_t           fMixEventTriggerMask ;   // select this triggerered event for mixing, tipically kMB or kAnyINT
   Bool_t           fEventTriggerAtSE;       // select triggered event at SE base task or here
   
   Bool_t           fAnaLED;                 // Analyze LED data only.
@@ -484,7 +490,7 @@ public:
   AliCaloTrackReader(              const AliCaloTrackReader & r) ; // cpy ctor
   AliCaloTrackReader & operator = (const AliCaloTrackReader & r) ; // cpy assignment
   
-  ClassDef(AliCaloTrackReader,40)
+  ClassDef(AliCaloTrackReader,41)
   
 } ;