Fixes for bug #49914: Compilation breaks in trunk, and bug #48629: Trunk cannot read...

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

diff --git a/STEER/AliReconstruction.h b/STEER/AliReconstruction.h
index b8427645a482225cbad35673af2f5e5297303c7a..d902b160fc63b72ac84008f8666894a4c85fcb19 100644 (file)
--- a/STEER/AliReconstruction.h
+++ b/STEER/AliReconstruction.h
@@ -11,7 +11,7 @@
 // Clusters and tracks are created for all detectors and all events by       //
 // typing:                                                                   //
 //                                                                           //
-//   AliReconstruction rec;                                                 QARef //
+//   AliReconstruction rec;                                                  //
 //   rec.Run();                                                              //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
@@ -41,7 +41,7 @@ class AliRecoParam;
 class AliDetectorRecoParam;
 class AliRunInfo;
 class AliGRPObject;
-#include "AliQA.h"
+#include "AliQAv1.h"
 #include "AliEventInfo.h"
 #include "AliRecoParam.h"
 
@@ -138,13 +138,14 @@ public:
   void        ImportRunLoader(AliRunLoader* rl) { fRunLoader = rl; }
 
   // Quality Assurance 
-  void    SetQACycles(AliQA::DETECTORINDEX_t det, Int_t cycles) { fQACycles[det] = cycles ; }
-  void    SetQAWriteExpert(AliQA::DETECTORINDEX_t det) { fQAWriteExpert[det] = kTRUE ; }
+  void    SetQACycles(AliQAv1::DETECTORINDEX_t det, Int_t cycles) { fQACycles[det] = cycles ; }
+  void    SetQAWriteExpert(AliQAv1::DETECTORINDEX_t det) { fQAWriteExpert[det] = kTRUE ; }
   Bool_t  SetRunQA(TString detAndAction="ALL:ALL") ; 
   void    SetRunGlobalQA(Bool_t flag=kTRUE){fRunGlobalQA = flag;}
   void    SetQARefDefaultStorage(const char* uri);
   void    InitQA();
   void    MergeQA(); 
+  void    SetWriteQAExpert() { fWriteQAExpertData = kTRUE ; }
 
   // Plane Efficiency Evaluation
   void    SetRunPlaneEff(Bool_t flag=kFALSE)  {fRunPlaneEff = flag;}
@@ -267,8 +268,8 @@ private:
   Bool_t        fSetRunNumberFromDataCalled;  //! flag to check if run number is already loaded from run loader
 
   //Quality Assurance
-  Int_t  fQACycles[     AliQA::kNDET];  // # events over which QA data are accumulated
-  Bool_t fQAWriteExpert[AliQA::kNDET];  // Flag to save or not expert QA data
+  Int_t  fQACycles[     AliQAv1::kNDET];  // # events over which QA data are accumulated
+  Bool_t fQAWriteExpert[AliQAv1::kNDET];  // Flag to save or not expert QA data
   TString               fQADetectors ;  // list of detectors to be QA'ed       
   AliQAManager * fQAManager    ;   //! steering class to run QA
   TString               fQATasks ;      // list of QA tasks to be performed    
@@ -276,7 +277,8 @@ private:
   Bool_t                fRunGlobalQA;   // Run global QA flag
   Bool_t                fSameQACycle;   //! open a new QA data file or not
   Bool_t                fInitQACalled;  //! control of QA intialisation
-  
+  Bool_t                fWriteQAExpertData ; //! decides wheter or not to write experts QA data; true by default
+
   // Plane Efficiency Evaluation
   Bool_t         fRunPlaneEff ;      // Evaluate Plane Efficiency