100 classes interfaces for STEER classes

diff --git a/STEER/ESD/AliESDEvent.h b/STEER/ESD/AliESDEvent.h
index 56db016d3f9d5be64da8bcd4b3fe298ef4b2a99b..216acf8e52fb0dfd6696669fb20bce9f86450d5c 100644 (file)
--- a/STEER/ESD/AliESDEvent.h
+++ b/STEER/ESD/AliESDEvent.h
@@ -187,6 +187,7 @@ public:
 
   // Delegated methods for fHeader
   void      SetTriggerMask(ULong64_t n) {if(fHeader) fHeader->SetTriggerMask(n);}
+  void      SetTriggerMaskNext50(ULong64_t n) {if(fHeader) fHeader->SetTriggerMaskNext50(n);}
   void      SetOrbitNumber(UInt_t n) {if(fHeader) fHeader->SetOrbitNumber(n);}
   void      SetTimeStamp(UInt_t timeStamp){if(fHeader) fHeader->SetTimeStamp(timeStamp);}
   void      SetEventType(UInt_t eventType){if(fHeader) fHeader->SetEventType(eventType);}
@@ -197,8 +198,11 @@ public:
   void      SetTriggerCluster(UChar_t n) {if(fHeader) fHeader->SetTriggerCluster(n);}
   
   ULong64_t GetTriggerMask() const {return fHeader?fHeader->GetTriggerMask():0;}
-  TString   GetFiredTriggerClasses() const {return (fESDRun&&fHeader)?fESDRun->GetFiredTriggerClasses(fHeader->GetTriggerMask()):"";}
-  Bool_t    IsTriggerClassFired(const char *name) const {return (fESDRun&&fHeader)?fESDRun->IsTriggerClassFired(fHeader->GetTriggerMask(),name):kFALSE;}
+  ULong64_t GetTriggerMaskNext50() const {return fHeader?fHeader->GetTriggerMaskNext50():0;}
+  //TString   GetFiredTriggerClasses() const {return (fESDRun&&fHeader)?fESDRun->GetFiredTriggerClasses(fHeader->GetTriggerMask()):"";}
+  TString   GetFiredTriggerClasses() const {return (fESDRun&&fHeader)?fESDRun->GetFiredTriggerClasses(fHeader->GetTriggerMask(),fHeader->GetTriggerMaskNext50()):"";}
+  //Bool_t    IsTriggerClassFired(const char *name) const {return (fESDRun&&fHeader)?fESDRun->IsTriggerClassFired(fHeader->GetTriggerMask(),name):kFALSE;}
+  Bool_t    IsTriggerClassFired(const char *name) const {return (fESDRun&&fHeader)?fESDRun->IsTriggerClassFired(fHeader->GetTriggerMask(),fHeader->GetTriggerMaskNext50(),name):kFALSE;}
   Bool_t    IsEventSelected(const char *trigExpr) const;
   TObject*  GetHLTTriggerDecision() const;
   TString   GetHLTTriggerDescription() const;

diff --git a/STEER/ESD/AliESDRun.cxx b/STEER/ESD/AliESDRun.cxx
index d4e658e12e645a604503b36d423d549cece57a09..e2c85fa1642828f9263fb3eca8c25fe436e529ce 100644 (file)
--- a/STEER/ESD/AliESDRun.cxx
+++ b/STEER/ESD/AliESDRun.cxx
@@ -304,6 +304,7 @@ TString AliESDRun::GetFiredTriggerClasses(ULong64_t mask) const
   // list of trigger classes that
   // have been fired. Uses the trigger
   // class mask as an argument.
+  // Works both for first50 and next50 classes
   TString trclasses;
   for(Int_t i = 0; i < kNTriggerClasses; i++) {
     if (mask & (1ull << i)) {
@@ -319,6 +320,18 @@ TString AliESDRun::GetFiredTriggerClasses(ULong64_t mask) const
   return trclasses;
 }
 
+//______________________________________________________________________________
+TString AliESDRun::GetFiredTriggerClasses(ULong64_t masklow,ULong64_t maskhigh) const
+{
+ // Contruct and returns list of trigger classes for 100 classes
+ TString trclasseslow;
+ trclasseslow  = GetFiredTriggerClasses(masklow);
+ TString trclasseshigh;
+ trclasseshigh  = GetFiredTriggerClasses(maskhigh);
+ TString trclasses;
+ trclasses = trclasseslow+trclasseshigh;
+ return trclasses;
+}
 //______________________________________________________________________________
 Bool_t AliESDRun::IsTriggerClassFired(ULong64_t mask, const char *name) const
 {
@@ -337,7 +350,11 @@ Bool_t AliESDRun::IsTriggerClassFired(ULong64_t mask, const char *name) const
   else
     return kFALSE;
 }
-
+//______________________________________________________________________________
+Bool_t AliESDRun::IsTriggerClassFired(ULong64_t masklow, ULong64_t maskhigh,const char *name) const
+{
+ return (IsTriggerClassFired(masklow,name) || IsTriggerClassFired(maskhigh,name));
+}
 //_____________________________________________________________________________
 Bool_t AliESDRun::InitMagneticField() const
 {

diff --git a/STEER/ESD/AliESDRun.h b/STEER/ESD/AliESDRun.h
index cb59466b28ba13875471f9ab513127fbde5f85a7..aa5d3da6e4fd43c5a6add8c12976d155ff946e08 100644 (file)
--- a/STEER/ESD/AliESDRun.h
+++ b/STEER/ESD/AliESDRun.h
@@ -62,7 +62,9 @@ public:
   const char* GetTriggerClass(Int_t index) const;
   TString     GetActiveTriggerClasses() const;
   TString     GetFiredTriggerClasses(ULong64_t mask) const;
+  TString     GetFiredTriggerClasses(ULong64_t mask,ULong64_t mask2) const;
   Bool_t      IsTriggerClassFired(ULong64_t mask, const char *name) const;
+  Bool_t      IsTriggerClassFired(ULong64_t mask, ULong64_t mask2,const char *name) const;
   Float_t     GetCurrentL3()               const {return fCurrentL3;}
   Float_t     GetCurrentDip()              const {return fCurrentDip;}
   Float_t     GetBeamEnergy()              const {return IsBeamEnergyIsSqrtSHalfGeV() ? fBeamEnergy : fBeamEnergy/2;}
@@ -89,7 +91,7 @@ public:
        return ((i >= 0) && (i < kNEMCALMatrix)) ? fEMCALMatrix[i] : NULL;
   }
        
-  enum {kNTriggerClasses = 50};
+  enum {kNTriggerClasses = 100};
   enum {kNPHOSMatrix = 5};
   enum {kNEMCALMatrix = 22};
   enum {kT0spreadSize = 4};

diff --git a/STEER/ESD/AliTriggerConfiguration.h b/STEER/ESD/AliTriggerConfiguration.h
index 11f9377ceb91558df02ee9e7a168bdccf95ba8c7..82c8130964272534424b7fbe474a117affbd7115 100755 (executable)
--- a/STEER/ESD/AliTriggerConfiguration.h
+++ b/STEER/ESD/AliTriggerConfiguration.h
@@ -106,8 +106,8 @@ public:
       enum {kNMaxInputs = 60}; // CTP handles up to 60 trigger detector inputs
       enum {kNMaxInteractions = 2}; // CTP handles up to two different interactions
       enum {kNMaxFunctions = 4}; // CTP handles up to 4 different logical functions
-      enum {kNMaxClasses = 50}; // Maximum number of trigger classes = 50
-      enum {kNMaxClusters = 6}; // Maximum number of different detector clusters that can be handled by CTP
+      enum {kNMaxClasses = 100}; // Maximum number of trigger classes = 50
+      enum {kNMaxClusters = 8}; // Maximum number of different detector clusters that can be handled by CTP
       enum {kNMaxPFProtections = 4}; // Maximum number of different past-future protections that can be handled by CTP
       enum {kNMaxMasks = 13};  // CTP handles up to 12 different BC masks + NONE
 

diff --git a/STEER/STEER/AliRawDataHeaderSim.h b/STEER/STEER/AliRawDataHeaderSim.h
index 132b5e984bdff11ab37434e9d3dedd7a42dc8897..721b257c3ff9738c5a6ae19d0b3afea9825d4d14 100644 (file)
--- a/STEER/STEER/AliRawDataHeaderSim.h
+++ b/STEER/STEER/AliRawDataHeaderSim.h
@@ -20,7 +20,9 @@ public:
       if(!runloader->GetTrigger()) runloader->LoadTrigger();
       if (AliCentralTrigger *aCTP = runloader->GetTrigger()) {
        ULong64_t mask = aCTP->GetClassMask();
+       ULong64_t masknext = aCTP->GetClassMaskNext50();
        SetTriggerClass(mask);
+       SetTriggerClassNext50(masknext);
       }
       else
        Warning("SetTriggerClass","No trigger can be loaded! Putting empty trigger class into the raw data header !");