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 3b3ea784b8bdc946182573f41219dfd05a322909..d902b160fc63b72ac84008f8666894a4c85fcb19 100644 (file)
--- a/STEER/AliReconstruction.h
+++ b/STEER/AliReconstruction.h
@@ -35,13 +35,13 @@ class AliVertexerTracks;
 class TFile;
 class TTree;
 class TList;
-class AliQADataMakerSteer; 
+class AliQAManager; 
 class TMap;
 class AliRecoParam;
 class AliDetectorRecoParam;
 class AliRunInfo;
 class AliGRPObject;
-#include "AliQA.h"
+#include "AliQAv1.h"
 #include "AliEventInfo.h"
 #include "AliRecoParam.h"
 
@@ -138,10 +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;}
@@ -166,6 +170,7 @@ private:
   Bool_t         RunVertexFinder(AliESDEvent*& esd);
   Bool_t         RunHLTTracking(AliESDEvent*& esd);
   Bool_t         RunMuonTracking(AliESDEvent*& esd);
+  Bool_t         RunSPDTrackleting(AliESDEvent*& esd);
   Bool_t         RunTracking(AliESDEvent*& esd);
   Bool_t         CleanESD(AliESDEvent *esd);
   Bool_t         FillESD(AliESDEvent*& esd, const TString& detectors);
@@ -247,6 +252,7 @@ private:
   AliRecoParam   fRecoParam;                      // container for the reco-param objects for detectors
   AliLoader*     fLoader[kNDetectors];   //! detector loaders
   AliTracker*    fTracker[kNDetectors];  //! trackers
+  AliTracker*    fSPDTrackleter;           //! trackleter [for SPD Plane Efficiency purposes]
   AliESDVertex*  fDiamondProfileSPD;       // (x,y) diamond profile from SPD for AliITSVertexer3D(Z)
   AliESDVertex*  fDiamondProfile;          // (x,y) diamond profile for AliVertexerTracks (ITS+TPC)
   AliESDVertex*  fDiamondProfileTPC;       // (x,y) diamond profile from TPC for AliVertexerTracks
@@ -256,19 +262,23 @@ private:
   TObjArray*    fAlignObjArray;      //! array with the alignment objects to be applied to the geometry
 
   TString       fCDBUri;             //! Uri of the default CDB storage
+  TString       fQARefUri;         //! Uri of the default QA reference storage
   TObjArray      fSpecCDBUri;         //! Array with detector specific CDB storages
   Bool_t        fInitCDBCalled;               //! flag to check if CDB storages are already initialized
   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       
-  AliQADataMakerSteer * fQASteer    ;   //! steering class to run QA
+  AliQAManager * fQAManager    ;   //! steering class to run QA
   TString               fQATasks ;      // list of QA tasks to be performed    
   Bool_t                fRunQA ;        // Run QA flag
   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
 
@@ -286,7 +296,7 @@ private:
 
   TTree*              fChain;      //! The raw-data chain in case of AliRawReaderChain
 
-  ClassDef(AliReconstruction, 30)      // class for running the reconstruction
+  ClassDef(AliReconstruction, 31)      // class for running the reconstruction
 };
 
 #endif