AliEventInfo: rest of the getters. AliRecoParam: the getter becomes virtual and is...

diff --git a/STEER/AliEventInfo.h b/STEER/AliEventInfo.h
index bce4d94e159e6cd4dd16507702d8696aa307ce22..a4de04d799cd9c29b4920874d11f91fe03f1ecec 100644 (file)
--- a/STEER/AliEventInfo.h
+++ b/STEER/AliEventInfo.h
@@ -34,6 +34,12 @@ class AliEventInfo : public TObject {
   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(); }
 
   AliEventInfo(const AliEventInfo &evInfo);
   AliEventInfo& operator= (const AliEventInfo& evInfo);

diff --git a/STEER/AliRecoParam.cxx b/STEER/AliRecoParam.cxx
index 9741d410a856af27dcc225c33126db69d67a7ccf..ad5838b2c05a32d5b5209edf3ec499b6ae01deac 100644 (file)
--- a/STEER/AliRecoParam.cxx
+++ b/STEER/AliRecoParam.cxx
@@ -28,6 +28,7 @@
 #include "TObjArray.h"
 #include "AliDetectorRecoParam.h"
 
+#include "AliLog.h"
 #include "AliRecoParam.h"
 
 
@@ -73,6 +74,16 @@ void  AliRecoParam::Print(Option_t *option) const {
   }
 }
 
+AliDetectorRecoParam *AliRecoParam::GetRecoParam(const AliEventInfo &/*evInfo*/) const {
+  // To be implemented by the detectors
+  // Here we return the last AliDetectorRecoParam!!
+  if (!fRecoParamArray) return NULL;
+  if (fRecoParamArray->GetEntriesFast() != 1)
+    AliWarning(Form("Method not implemented by the detector %s, using the last AliDetectorRecoParam !",GetName()));
+
+  return (AliDetectorRecoParam *)fRecoParamArray->Last();
+}
+
 void  AliRecoParam::AddRecoParam(AliDetectorRecoParam* param){
   // Add an instance of reco params object into
   // the fRecoParamArray

diff --git a/STEER/AliRecoParam.h b/STEER/AliRecoParam.h
index 0f9dadfee93be1d40af68049e95d7ae3efd6aaf9..7ab4142b962079058f74c8930aaa2378d9a2c01e 100644 (file)
--- a/STEER/AliRecoParam.h
+++ b/STEER/AliRecoParam.h
@@ -26,7 +26,7 @@ class AliRecoParam : public TNamed
   //
   virtual void                  Print(Option_t *option="") const;
   TObjArray                    *GetAllRecoParams() const { return fRecoParamArray; }
-  virtual AliDetectorRecoParam *GetRecoParam(const AliEventInfo &evInfo) const = 0;
+  virtual AliDetectorRecoParam *GetRecoParam(const AliEventInfo &/*evInfo*/) const;
   void                          AddRecoParam(AliDetectorRecoParam* param);
 
 protected: