Added some extra CF plots and changed binning for a few histograms (kathrin) anddded...

[u/mrichter/AliRoot.git] / STEER / AliEventInfo.h

diff --git a/STEER/AliEventInfo.h b/STEER/AliEventInfo.h
index a4de04d799cd9c29b4920874d11f91fe03f1ecec..5ce4f1ab489185ae6d78285a51d144006bbc895c 100644 (file)
--- a/STEER/AliEventInfo.h
+++ b/STEER/AliEventInfo.h
@@ -5,11 +5,13 @@
 
 //////////////////////////////////////////////////////////////////////////////
 //                          Class AliEventInfo                              //
-//   Container class for all the information related to LHCstate, run and   //
-//   event types, trigger mask and trigger clusters.                        //
-//   It is used in order to provide the detector's AliRecoParam objects with//
-//   the necessary information so that they can decide which instance of    //
-//   AliDetectorRecoParam to use in reconstruction one particular event.    //
+//   Container class for all the information related to                     //
+//   event type, trigger mask and trigger clusters.                         //
+//   It is used together with AliRunInfo in order to provide the detector's //
+//   AliRecoParam object with                                               //
+//   the necessary information so that it can decide which instance of      //
+//   AliDetectorRecoParam objects to use in reconstruction one particular   //
+//   event.                                                                 //
 //                                                                          //
 //   cvetan.cheshkov@cern.ch 12/06/2008                                     //
 //////////////////////////////////////////////////////////////////////////////
@@ -21,41 +23,41 @@ class AliEventInfo : public TObject {
 
  public:
   AliEventInfo();
-  AliEventInfo(const char *lhcState,
-              const char *runType,
-              const char *activeDetectors);
+  AliEventInfo(UInt_t evType,
+              const char *classes,
+              ULong64_t mask,
+              const char *cluster,
+              const char *decision);
   virtual ~AliEventInfo() {}
 
   void SetEventType(UInt_t evType) { fEventType = evType; }
-  void SetTriggerClasses(const char *classes) { fTriggerClasses.SetString(classes); }
-  void SetTriggerMask(ULong_t mask) { fTriggerMask = mask; }
-  void SetTriggerCluster(const char *cluster) { fTriggerCluster.SetString(cluster); }
+  void SetTriggerClasses(const char *classes) { fTriggerClasses = classes; }
+  void SetTriggerMask(ULong64_t mask) { fTriggerMask = mask; }
+  void SetTriggerCluster(const char *cluster) { fTriggerCluster = cluster; }
+  void SetHLTDecision(const char *decision) { fHLTDecision = decision; }
 
   virtual void Print(Option_t */*option=""*/) const { Dump(); }
 
-  const char *GetLHCState() const { return fLHCState.GetString().Data(); }
-  const char *GetRunType() const { return fRunType.GetString().Data(); }
-  const char *GetActiveDetectors() const { return fActiveDetectors.GetString().Data(); }
   UInt_t      GetEventType() const { return fEventType; }
-  const char *GetTriggerClasses() const { return fTriggerClasses.GetString().Data(); }
-  ULong_t     GetTriggerMask() const { return fTriggerMask; }
-  const char *GetTriggerCluster() const { return fTriggerCluster.GetString().Data(); }
+  const char *GetTriggerClasses() const { return fTriggerClasses.Data(); }
+  ULong64_t   GetTriggerMask() const { return fTriggerMask; }
+  const char *GetTriggerCluster() const { return fTriggerCluster.Data(); }
+  const char *GetHLTDecision() const { return fHLTDecision.Data(); }
 
   AliEventInfo(const AliEventInfo &evInfo);
   AliEventInfo& operator= (const AliEventInfo& evInfo);
 
   void Reset();
+
  private:
 
-  TObjString  fLHCState;       // state of the machine as provided by DCS and DAQ log-book (per run)
-  TObjString  fRunType;        // run type accoring to ECS (per run)
-  TObjString  fActiveDetectors;// list of active detectors (per run)
   UInt_t      fEventType;      // event type as defined by DAQ (start_of_*,calibration,physics etc) (per event)
-  TObjString  fTriggerClasses; // list of fired trigger classes (per event)
-  ULong_t     fTriggerMask;    // trigger mask as received from DAQ or CTP raw-data payload (per event)
-  TObjString  fTriggerCluster; // list of detectors that have been read out (per event)
+  TString     fTriggerClasses; // list of fired trigger classes (per event)
+  ULong64_t   fTriggerMask;    // trigger mask as received from DAQ or CTP raw-data payload (per event)
+  TString     fTriggerCluster; // list of detectors that have been read out (per event)
+  TString     fHLTDecision;    // string describing the HLT decision (per event)
 
-  ClassDef(AliEventInfo,1)     // Event info class
+  ClassDef(AliEventInfo,3)     // Event info class
 };
 
 #endif