Removal of out-of-event-loop QA. Correlation QA. Some clean-up in QA code (Yves)

diff --git a/FMD/AliFMDQADataMakerRec.cxx b/FMD/AliFMDQADataMakerRec.cxx
index dc0a697732596f50ada9661acf593162c2a1ede5..64d379c707ffb4e7d8ec53dedfb7f89c55ca3a28 100644 (file)
--- a/FMD/AliFMDQADataMakerRec.cxx
+++ b/FMD/AliFMDQADataMakerRec.cxx
@@ -136,29 +136,12 @@ void AliFMDQADataMakerRec::InitRecPoints()
 //_____________________________________________________________________ 
 void AliFMDQADataMakerRec::InitRaws()
 {
 //_____________________________________________________________________ 
 void AliFMDQADataMakerRec::InitRaws()
 {

-  
-  TH1I* hADCCounts;
-  for(Int_t det = 1; det<=3; det++) {
-    Int_t firstring = (det==1 ? 1 : 0);
-    for(Int_t iring = firstring;iring<=1;iring++) {
-      for(Int_t b = 0; b<=1;b++) {
-       
-       //Hexadecimal board numbers 0x0, 0x1, 0x10, 0x10;
-       UInt_t board = (iring == 1 ? 0 : 1);
-       board = board + b*16;
-       Char_t ring = (iring == 1 ? 'I' : 'O');
-       
-       hADCCounts      = new TH1I(Form("hADCCounts_FMD%d%c_board%d",
-                                       det, ring, board), "ADC counts",
+  TH1I* hADCCounts      = new TH1I("hADCCounts","Dist of ADC counts",

                                   1024,0,1023);
                                   1024,0,1023);

-       hADCCounts->SetXTitle("ADC counts");
-       hADCCounts->SetYTitle("");
-       Int_t index = GetHalfringIndex(det, ring, board/16);
-       Add2RawsList(hADCCounts, index);
-       
-      }
-    }
-  }
+  hADCCounts->SetXTitle("ADC counts");
+  hADCCounts->SetYTitle("");
+  Add2RawsList(hADCCounts, 0);
+

 }
 
 //_____________________________________________________________________
 }
 
 //_____________________________________________________________________


@@ -232,19 +215,9 @@ void AliFMDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
        digitsAddress->Clear();
        fmdReader.ReadAdcs(digitsAddress);
        for(Int_t i=0;i<digitsAddress->GetEntriesFast();i++) {
        digitsAddress->Clear();
        fmdReader.ReadAdcs(digitsAddress);
        for(Int_t i=0;i<digitsAddress->GetEntriesFast();i++) {

-         //Raw ADC counts
-         AliFMDDigit* digit = static_cast<AliFMDDigit*>(digitsAddress->At(i));
-         UShort_t det = digit->Detector();
-         Char_t ring  = digit->Ring();
-         UShort_t sec = digit->Sector();
-         UShort_t strip = digit->Strip();
-         UInt_t ddl, board, chip, channel;
-         AliFMDParameters* pars = AliFMDParameters::Instance();
-         pars->Detector2Hardware(det,ring,sec,strip,ddl,board,chip,channel);
-         Int_t index = GetHalfringIndex(det, ring, board/16);
-         
-         GetRawsData(index)->Fill(digit->Counts());
-         
+               //Raw ADC counts
+               AliFMDDigit* digit = static_cast<AliFMDDigit*>(digitsAddress->At(i));
+               GetRawsData(0)->Fill(digit->Counts());

        }
 }
 
        }
 }
 


@@ -282,21 +255,6 @@ void AliFMDQADataMakerRec::StartOfDetectorCycle()
   // do?
 }
 //_____________________________________________________________________ 
   // do?
 }
 //_____________________________________________________________________ 

-Int_t AliFMDQADataMakerRec::GetHalfringIndex(UShort_t det, 
-                                            Char_t ring, 
-                                            UShort_t board) {
-  
-  UShort_t iring  =  (ring == 'I' ? 1 : 0);
-  
-  Int_t index = (((det-1) << 2) | (iring << 1) | (board << 0));
-  
-  return index-2;
-  
-}
-
-//_____________________________________________________________________ 
-
-

 //
 // EOF
 //
 //
 // EOF
 //

diff --git a/ITS/AliITSQASSDDataMakerRec.cxx b/ITS/AliITSQASSDDataMakerRec.cxx
index fcb5d79d3e0004e083f6cf155c64eb8c598b84db..55f83e3d3d6330018606f63b1ce070ee0a133113 100644 (file)
--- a/ITS/AliITSQASSDDataMakerRec.cxx
+++ b/ITS/AliITSQASSDDataMakerRec.cxx
@@ -138,6 +138,10 @@ AliITSQASSDDataMakerRec::~AliITSQASSDDataMakerRec() {
 void AliITSQASSDDataMakerRec::StartOfDetectorCycle()\r
 {\r
   //Detector specific actions at start of cycle\r
 void AliITSQASSDDataMakerRec::StartOfDetectorCycle()\r
 {\r
   //Detector specific actions at start of cycle\r

+  \r
+  if (  fAliITSQADataMakerRec->GetRawsData(0) == NULL ) // Raws not defined\r
+    return ; \r
+  \r

   AliDebug(1,"AliITSQADM::Start of SSD Cycle\n");    \r
 \r
   //Data size per DDL\r
   AliDebug(1,"AliITSQADM::Start of SSD Cycle\n");    \r
 \r
   //Data size per DDL\r


@@ -174,6 +178,9 @@ void AliITSQASSDDataMakerRec::StartOfDetectorCycle()
 void AliITSQASSDDataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray* list)\r
 {\r
   // launch the QA checking\r
 void AliITSQASSDDataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray* list)\r
 {\r
   // launch the QA checking\r

+  if (  fAliITSQADataMakerRec->GetRawsData(0) == NULL ) // Raws not defined\r
+    return ; \r
+  \r

   AliDebug(1,"AliITSDM instantiates checker with Run(AliQA::kITS, task, list)\n"); \r
   //Data size per DDL\r
   for(Int_t i = 0; i < fgkNumOfDDLs; i++) {\r
   AliDebug(1,"AliITSDM instantiates checker with Run(AliQA::kITS, task, list)\n"); \r
   //Data size per DDL\r
   for(Int_t i = 0; i < fgkNumOfDDLs; i++) {\r

diff --git a/MUON/AliMUONPadStatusMaker.cxx b/MUON/AliMUONPadStatusMaker.cxx
index d8327532f24b662d230cfa3ccc715d802abc6ec0..d054910ac42655d60034414d551fcdfe8b22c7f8 100644 (file)
--- a/MUON/AliMUONPadStatusMaker.cxx
+++ b/MUON/AliMUONPadStatusMaker.cxx
@@ -87,7 +87,7 @@ fTrackerData(0x0)
                   fPedestals->ClassName(),
                   fGains->ClassName()));
   
                   fPedestals->ClassName(),
                   fGains->ClassName()));
   

-  TString qaFileName(AliQA::GetQADataFileName("MUON",calibData.RunNumber(),0));
+  TString qaFileName(AliQA::GetQADataFileName("MUON",calibData.RunNumber()));

   
   // search the QA file in memory first.
   TFile* f = static_cast<TFile*>(gROOT->GetListOfFiles()->FindObject(qaFileName.Data()));
   
   // search the QA file in memory first.
   TFile* f = static_cast<TFile*>(gROOT->GetListOfFiles()->FindObject(qaFileName.Data()));

diff --git a/STEER/AliCorrQADataMakerRec.cxx b/STEER/AliCorrQADataMakerRec.cxx
index e11a79fe21992d1ee9bc5e0f6fe3afb6f8414837..776b2eeab8e360e113be5ca21e6b2ad8fa2dcd9c 100644 (file)
--- a/STEER/AliCorrQADataMakerRec.cxx
+++ b/STEER/AliCorrQADataMakerRec.cxx
@@ -75,8 +75,9 @@ void AliCorrQADataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArra
 {
   //Detector specific actions at end of cycle
   // do the QA checking
 {
   //Detector specific actions at end of cycle
   // do the QA checking

-  if (task == AliQA::kRAWS) 
-    AliQAChecker::Instance()->Run(AliQA::kCORR, task, fObject) ; 
+  if (task == AliQA::kRAWS) {
+     AliQAChecker::Instance()->Run(AliQA::kCORR, task, fObject) ; 
+  }

 }
 
 //____________________________________________________________________________ 
 }
 
 //____________________________________________________________________________ 


@@ -137,7 +138,7 @@ void AliCorrQADataMakerRec::MakeESDs(AliESDEvent * /*esd*/)
 }
 
 //____________________________________________________________________________
 }
 
 //____________________________________________________________________________

-void AliCorrQADataMakerRec::MakeRaws()
+void AliCorrQADataMakerRec::MakeRaws(AliRawReader *)

 {
   //Fill prepared histograms with Raw digit properties
   if ( fMaxRawVar > 0 ) {
 {
   //Fill prepared histograms with Raw digit properties
   if ( fMaxRawVar > 0 ) {


@@ -170,4 +171,5 @@ void AliCorrQADataMakerRec::MakeRecPoints(TTree * /*clustersTree*/)
 void AliCorrQADataMakerRec::StartOfDetectorCycle()
 {
   //Detector specific actions at start of cycle  
 void AliCorrQADataMakerRec::StartOfDetectorCycle()
 {
   //Detector specific actions at start of cycle  

+

 }
 }

diff --git a/STEER/AliCorrQADataMakerRec.h b/STEER/AliCorrQADataMakerRec.h
index 86e4079ea1151e69775040f13094b88eac5fe22e..23ddc823c0599bb3232e62585ae8af738d57e654 100644 (file)
--- a/STEER/AliCorrQADataMakerRec.h
+++ b/STEER/AliCorrQADataMakerRec.h
@@ -30,7 +30,6 @@ public:
   AliCorrQADataMakerRec(const AliCorrQADataMakerRec& qadm) ;   
   AliCorrQADataMakerRec& operator = (const AliCorrQADataMakerRec& qadm) ;
   virtual ~AliCorrQADataMakerRec() {;} // dtor
   AliCorrQADataMakerRec(const AliCorrQADataMakerRec& qadm) ;   
   AliCorrQADataMakerRec& operator = (const AliCorrQADataMakerRec& qadm) ;
   virtual ~AliCorrQADataMakerRec() {;} // dtor

-  void    MakeRaws() ; 

   
 private:
 
   
 private:
 


@@ -40,7 +39,7 @@ private:
   virtual void   InitRaws() ; 
   virtual void   MakeESDs(AliESDEvent * esd) ;
   virtual void   MakeRecPoints(TTree * recpoTree) ; 
   virtual void   InitRaws() ; 
   virtual void   MakeESDs(AliESDEvent * esd) ;
   virtual void   MakeRecPoints(TTree * recpoTree) ; 

-  virtual void   MakeRaws(AliRawReader *) { AliWarning("May not use") ;} 
+  virtual void   MakeRaws(AliRawReader *) ; 

   virtual void   StartOfDetectorCycle() ; 
 
   Int_t fMaxRawVar ;              //! number of raw parameters in the ntuple
   virtual void   StartOfDetectorCycle() ; 
 
   Int_t fMaxRawVar ;              //! number of raw parameters in the ntuple

diff --git a/STEER/AliQA.cxx b/STEER/AliQA.cxx
index 7c95ac2dd0bcb9df0dd93ffd2e617f8eddb0a32f..a53bbad9d7ee3e4492c7948cb900bc4badcde74b 100644 (file)
--- a/STEER/AliQA.cxx
+++ b/STEER/AliQA.cxx
@@ -76,6 +76,7 @@ const TString AliQA::fkgQACorrNtName     = "CorrQA" ;
 const TString AliQA::fkgRefOCDBDirName   = "Ref"  ; 
 TString AliQA::fkgRefDataDirName        = ""  ; 
 const TString AliQA::fkgQARefOCDBDefault = "alien://folder=/alice/QA/20"  ; 
 const TString AliQA::fkgRefOCDBDirName   = "Ref"  ; 
 TString AliQA::fkgRefDataDirName        = ""  ; 
 const TString AliQA::fkgQARefOCDBDefault = "alien://folder=/alice/QA/20"  ; 

+

 //____________________________________________________________________________
 AliQA::AliQA() : 
   TNamed("", ""), 
 //____________________________________________________________________________
 AliQA::AliQA() : 
   TNamed("", ""), 


@@ -300,10 +301,10 @@ const char * AliQA::GetDetName(Int_t det)
 }
 
 //_______________________________________________________________
 }
 
 //_______________________________________________________________

-TFile * AliQA::GetQADataFile(const char * name, const Int_t run, const Int_t cycle) 
+TFile * AliQA::GetQADataFile(const char * name, const Int_t run) 

 {
   // opens the file to store the detectors Quality Assurance Data Maker results
 {
   // opens the file to store the detectors Quality Assurance Data Maker results

-       const char * temp = Form("%s.%s.%d.%d.root", name, fgQADataFileName.Data(), run, cycle) ; 
+       const char * temp = Form("%s.%s.%d.root", name, fgQADataFileName.Data(), run) ; 

        TString opt ; 
        if (! fgQADataFile ) {     
                if  (gSystem->AccessPathName(temp))
        TString opt ; 
        if (! fgQADataFile ) {     
                if  (gSystem->AccessPathName(temp))

diff --git a/STEER/AliQA.h b/STEER/AliQA.h
index 6f77df634bf495da981acc113415a66c6436cde8..63573cedf539a1d5f491a54bd13c01d2f08265a4 100644 (file)
--- a/STEER/AliQA.h
+++ b/STEER/AliQA.h
@@ -57,10 +57,10 @@ public:
        static const TString   GetDetName(DETECTORINDEX_t det) { return fgDetNames[det] ; }
        static const char *    GetDetName(Int_t det) ;
        static const TString   GetGRPPath() { return fgGRPPath ; }  
        static const TString   GetDetName(DETECTORINDEX_t det) { return fgDetNames[det] ; }
        static const char *    GetDetName(Int_t det) ;
        static const TString   GetGRPPath() { return fgGRPPath ; }  

-       static TFile *         GetQADataFile(const char * name, const Int_t run, const Int_t cycle) ; 
+       static TFile *         GetQADataFile(const char * name, const Int_t run) ; 

        static TFile *         GetQADataFile(const char * fileName) ;
        static TFile *         GetQADataFile(const char * fileName) ;

-       static const char *    GetQADataFileName(const char * name, const Int_t run, const Int_t cycle) 
-                                                                                                               {return Form("%s.%s.%d.%d.root", name, fgQADataFileName.Data(), run, cycle)  ; }
+       static const char *    GetQADataFileName(const char * name, const Int_t run) 
+                                                                                                               {return Form("%s.%s.%d.root", name, fgQADataFileName.Data(), run)  ; }

        static const char *    GetQADataFileName() { return fgQADataFileName.Data() ; }
        static const char *    GetQAName() { return fkgQAName ; } 
   static const char *    GetQACorrName() { return fkgQACorrNtName ; }
        static const char *    GetQADataFileName() { return fgQADataFileName.Data() ; }
        static const char *    GetQAName() { return fkgQAName ; } 
   static const char *    GetQACorrName() { return fkgQACorrNtName ; }

diff --git a/STEER/AliQACheckerBase.h b/STEER/AliQACheckerBase.h
index 0bac1e1ee77e1ea064d25c058db58f5ca4a23e3a..7c6d6dd1bfa4d6a7d654fdc872c6a1302017560c 100644 (file)
--- a/STEER/AliQACheckerBase.h
+++ b/STEER/AliQACheckerBase.h
@@ -41,7 +41,7 @@ public:
 protected:
   virtual const Double_t Check(AliQA::ALITASK_t index) ;
   virtual const Double_t Check(AliQA::ALITASK_t, TObjArray *) ; 
 protected:
   virtual const Double_t Check(AliQA::ALITASK_t index) ;
   virtual const Double_t Check(AliQA::ALITASK_t, TObjArray *) ; 

-  virtual const Double_t Check(AliQA::ALITASK_t, TNtupleD *) {;} 
+  virtual const Double_t Check(AliQA::ALITASK_t, TNtupleD *) { return -1.0 ;} 

   const Double_t DiffC(const TH1 * href, const TH1 * hin) const ;   
   const Double_t DiffK(const TH1 * href, const TH1 * hin) const ;   
   void           Finish() const ; 
   const Double_t DiffC(const TH1 * href, const TH1 * hin) const ;   
   const Double_t DiffK(const TH1 * href, const TH1 * hin) const ;   
   void           Finish() const ; 

diff --git a/STEER/AliQADataMaker.cxx b/STEER/AliQADataMaker.cxx
index 7ffb483e0f4e7661a98e00c41cf66b0c419bffeb..7d48e30f42031f49cab2d3f2d528e5c62d4ef7fa 100644 (file)
--- a/STEER/AliQADataMaker.cxx
+++ b/STEER/AliQADataMaker.cxx
@@ -48,7 +48,7 @@ AliQADataMaker::AliQADataMaker(const char * name, const char * title) :
   fOutput(0x0),
   fDetectorDir(0x0),
   fDetectorDirName(""), 
   fOutput(0x0),
   fDetectorDir(0x0),
   fDetectorDirName(""), 

-  fCurrentCycle(-1), 
+  fCurrentCycle(0), 

   fCycle(9999999), 
   fCycleCounter(0), 
   fParameterList(0x0), 
   fCycle(9999999), 
   fCycleCounter(0), 
   fParameterList(0x0), 


@@ -138,12 +138,3 @@ TObject * AliQADataMaker::GetData(TObjArray * list, const Int_t index)
                return NULL ;           
        }
 }
                return NULL ;           
        }
 }

-
-//____________________________________________________________________________
-void AliQADataMaker::Reset(const Bool_t sameCycle) 
-{ 
-  // Resets defaut value of data members 
-       if (!sameCycle) {
-               fCycleCounter = 0 ; 
-       }
-}

diff --git a/STEER/AliQADataMaker.h b/STEER/AliQADataMaker.h
index 54e9e1a184c9358f39b69be914986a26d7479d13..f28ee346319f3f7b22d962ebc40e18e3744275c1 100644 (file)
--- a/STEER/AliQADataMaker.h
+++ b/STEER/AliQADataMaker.h
@@ -46,8 +46,9 @@ public:
        virtual Int_t Add2RecPointsList(TH1 * hist, const Int_t index)       = 0 ; 
        virtual Int_t Add2RawsList(TH1 * hist, const Int_t index, const Bool_t saveForCorr = kFALSE)            = 0 ; 
        virtual Int_t Add2SDigitsList(TH1 * hist, const Int_t index)         = 0 ; 
        virtual Int_t Add2RecPointsList(TH1 * hist, const Int_t index)       = 0 ; 
        virtual Int_t Add2RawsList(TH1 * hist, const Int_t index, const Bool_t saveForCorr = kFALSE)            = 0 ; 
        virtual Int_t Add2SDigitsList(TH1 * hist, const Int_t index)         = 0 ; 

-       virtual void        Exec(AliQA::TASKINDEX_t, TObject * data)                 = 0 ;
-       virtual void        EndOfCycle(AliQA::TASKINDEX_t)                           = 0 ;
+       virtual void        Exec(AliQA::TASKINDEX_t, TObject * data)         = 0 ;
+       virtual void        EndOfCycle()                                     = 0 ;
+       virtual void        EndOfCycle(AliQA::TASKINDEX_t)                   = 0 ;

        void                Finish() const ; 
        virtual TH1 *       GetDigitsData(const Int_t index)                       = 0 ; 
        virtual TH1 *       GetESDsData(const Int_t index)                         = 0 ; 
        void                Finish() const ; 
        virtual TH1 *       GetDigitsData(const Int_t index)                       = 0 ; 
        virtual TH1 *       GetESDsData(const Int_t index)                         = 0 ; 


@@ -58,12 +59,13 @@ public:
        const char *        GetDetectorDirName() const { return fDetectorDirName.Data() ; }
   TList *             GetParameterList() const { return fParameterList ; }
        const Int_t         Increment() { return ++fCycleCounter ; } 
        const char *        GetDetectorDirName() const { return fDetectorDirName.Data() ; }
   TList *             GetParameterList() const { return fParameterList ; }
        const Int_t         Increment() { return ++fCycleCounter ; } 

-       virtual TObjArray * Init(AliQA::TASKINDEX_t, Int_t run, Int_t cycles = -1)                   = 0 ;
+       virtual TObjArray * Init(AliQA::TASKINDEX_t, Int_t cycles = -1)                              = 0 ;

        virtual void        Init(AliQA::TASKINDEX_t, TObjArray * list, Int_t run, Int_t cycles = -1) = 0 ;
        const Bool_t        IsCycleDone() const { return fCycleCounter > fCycle ? kTRUE : kFALSE ; }
        virtual void        Init(AliQA::TASKINDEX_t, TObjArray * list, Int_t run, Int_t cycles = -1) = 0 ;
        const Bool_t        IsCycleDone() const { return fCycleCounter > fCycle ? kTRUE : kFALSE ; }

-       void                Reset(const Bool_t sameCycle = kTRUE) ;     
+       void                Reset() { fCycleCounter = 0 ; }

        void                SetCycle(Int_t nevts) { fCycle = nevts ; } 
        void                SetCycle(Int_t nevts) { fCycle = nevts ; } 

-       virtual void        StartOfCycle(AliQA::TASKINDEX_t, const Bool_t sameCycle = kFALSE) = 0 ;
+       virtual void        StartOfCycle(Int_t run = -1)                                                      = 0 ;
+       virtual void        StartOfCycle(AliQA::TASKINDEX_t, Int_t run, const Bool_t sameCycle = kFALSE) = 0 ;

 
        virtual void        SetRecoParam(const AliDetectorRecoParam */*param*/) { return; }
          
 
        virtual void        SetRecoParam(const AliDetectorRecoParam */*param*/) { return; }
          

diff --git a/STEER/AliQADataMakerRec.cxx b/STEER/AliQADataMakerRec.cxx
index 5c938037d7e3303e1368b7fb864e7b21f200ef28..72bd9ccd1e3d2da5c2c235d3a89863bb0801f941 100644 (file)
--- a/STEER/AliQADataMakerRec.cxx
+++ b/STEER/AliQADataMakerRec.cxx
@@ -95,10 +95,20 @@ AliQADataMakerRec& AliQADataMakerRec::operator = (const AliQADataMakerRec& qadm
   return *this;
 }
 
   return *this;
 }
 

+//____________________________________________________________________________
+void AliQADataMakerRec::EndOfCycle() 
+{
+  // Finishes a cycle of QA for all the tasks
+  EndOfCycle(AliQA::kRAWS) ; 
+  EndOfCycle(AliQA::kRECPOINTS) ; 
+  EndOfCycle(AliQA::kESDS) ; 
+  ResetCycle() ; 
+}
+

 //____________________________________________________________________________
 void AliQADataMakerRec::EndOfCycle(AliQA::TASKINDEX_t task) 
 {
 //____________________________________________________________________________
 void AliQADataMakerRec::EndOfCycle(AliQA::TASKINDEX_t task) 
 {

-       // Finishes a cycle of QA data acquistion
+       // Finishes a cycle of QA 

        
        TObjArray * list = NULL ; 
        
        
        TObjArray * list = NULL ; 
        


@@ -109,7 +119,10 @@ void AliQADataMakerRec::EndOfCycle(AliQA::TASKINDEX_t task)
        else if ( task == AliQA::kESDS )
                list = fESDsQAList ; 
 
        else if ( task == AliQA::kESDS )
                list = fESDsQAList ; 
 

-       //DefaultEndOfDetectorCycle(task) ;
+ 
+       if ( ! list && ! fObject ) 
+    return ; 
+  //DefaultEndOfDetectorCycle(task) ;

        EndOfDetectorCycle(task, list) ;
        TDirectory * subDir = NULL ;
        if (fDetectorDir) 
        EndOfDetectorCycle(task, list) ;
        TDirectory * subDir = NULL ;
        if (fDetectorDir) 


@@ -118,10 +131,10 @@ void AliQADataMakerRec::EndOfCycle(AliQA::TASKINDEX_t task)
                subDir->cd() ; 
                if (list) 
                        list->Write() ;
                subDir->cd() ; 
                if (list) 
                        list->Write() ;

-    if (fObject)
+    if (fObject) {

       fObject->Write() ; 
       fObject->Write() ; 

+    }

        }
        }

-       //Finish() ; 

 }
  
 //____________________________________________________________________________
 }
  
 //____________________________________________________________________________


@@ -135,7 +148,7 @@ void AliQADataMakerRec::Exec(AliQA::TASKINDEX_t task, TObject * data)
                if (rawReader) 
                        MakeRaws(rawReader) ;
                else
                if (rawReader) 
                        MakeRaws(rawReader) ;
                else

-               AliError("Wrong data type") ;     
+               AliInfo("Raw data are not processed") ;     

        } else if ( task == AliQA::kRECPOINTS ) {
                AliDebug(1, "Processing RecPoints QA") ; 
                TTree * tree = dynamic_cast<TTree *>(data) ; 
        } else if ( task == AliQA::kRECPOINTS ) {
                AliDebug(1, "Processing RecPoints QA") ; 
                TTree * tree = dynamic_cast<TTree *>(data) ; 


@@ -155,13 +168,12 @@ void AliQADataMakerRec::Exec(AliQA::TASKINDEX_t task, TObject * data)
 }
 
 //____________________________________________________________________________ 
 }
 
 //____________________________________________________________________________ 

-TObjArray *  AliQADataMakerRec::Init(AliQA::TASKINDEX_t task, Int_t run, Int_t cycles)
+TObjArray *  AliQADataMakerRec::Init(AliQA::TASKINDEX_t task, Int_t cycles)

 {
   // general intialisation
        
        TObjArray * rv = NULL ; 
   
 {
   // general intialisation
        
        TObjArray * rv = NULL ; 
   

-       fRun = run ;

        if (cycles > 0)
                SetCycle(cycles) ;  
        
        if (cycles > 0)
                SetCycle(cycles) ;  
        


@@ -210,14 +222,27 @@ void AliQADataMakerRec::Init(AliQA::TASKINDEX_t task, TObjArray * list, Int_t ru
 }
 
 //____________________________________________________________________________
 }
 
 //____________________________________________________________________________

-void AliQADataMakerRec::StartOfCycle(AliQA::TASKINDEX_t task, const Bool_t sameCycle) 
+void AliQADataMakerRec::StartOfCycle(Int_t run) 
+{
+  // Finishes a cycle of QA for all the tasks
+  Bool_t samecycle = kFALSE ; 
+  StartOfCycle(AliQA::kRAWS,      run, samecycle) ;
+  samecycle = kTRUE ; 
+  StartOfCycle(AliQA::kRECPOINTS, run, samecycle) ; 
+  StartOfCycle(AliQA::kESDS,      run, samecycle) ; 
+}
+
+//____________________________________________________________________________
+void AliQADataMakerRec::StartOfCycle(AliQA::TASKINDEX_t task, Int_t run, const Bool_t sameCycle) 

 { 
   // Finishes a cycle of QA data acquistion
 { 
   // Finishes a cycle of QA data acquistion

+  if ( run > 0 ) 
+    fRun = run ; 

        if ( !sameCycle || fCurrentCycle == -1) {
                ResetCycle() ;
                if (fOutput) 
                        fOutput->Close() ; 
        if ( !sameCycle || fCurrentCycle == -1) {
                ResetCycle() ;
                if (fOutput) 
                        fOutput->Close() ; 

-               fOutput = AliQA::GetQADataFile(GetName(), fRun, fCurrentCycle) ;        
+               fOutput = AliQA::GetQADataFile(GetName(), fRun) ;       

        }       
        AliInfo(Form(" Run %d Cycle %d task %s file %s", 
                                 fRun, fCurrentCycle, AliQA::GetTaskName(task).Data(), fOutput->GetName() )) ;
        }       
        AliInfo(Form(" Run %d Cycle %d task %s file %s", 
                                 fRun, fCurrentCycle, AliQA::GetTaskName(task).Data(), fOutput->GetName() )) ;


@@ -231,20 +256,5 @@ void AliQADataMakerRec::StartOfCycle(AliQA::TASKINDEX_t task, const Bool_t sameC
                subDir = fDetectorDir->mkdir(AliQA::GetTaskName(task)) ;  
        subDir->cd() ; 
 
                subDir = fDetectorDir->mkdir(AliQA::GetTaskName(task)) ;  
        subDir->cd() ; 
 

-       TObjArray * list = NULL ; 
-  
-  if ( task == AliQA::kRAWS ) 
-         list = fRawsQAList ; 
-  else if ( task == AliQA::kRECPOINTS)  
-         list = fRecPointsQAList ;
-  else if ( task == AliQA::kESDS )  
-         list = fESDsQAList ;
-       
-// Should be the choice of detectors
-//     TIter next(list) ;
-//     TH1 * h ; 
-//     while ( (h = dynamic_cast<TH1 *>(next())) )
-//             h->Reset() ;  
-

        StartOfDetectorCycle() ; 
 }
        StartOfDetectorCycle() ; 
 }

diff --git a/STEER/AliQADataMakerRec.h b/STEER/AliQADataMakerRec.h
index 4a65fe7b5c16790de956aaa19a606a0532988eeb..ba4d7ec86392f422aef3016a12fedea585a5ecd0 100644 (file)
--- a/STEER/AliQADataMakerRec.h
+++ b/STEER/AliQADataMakerRec.h
@@ -37,17 +37,19 @@ public:
        virtual Int_t Add2RawsList(TH1 * hist, const Int_t index, const Bool_t saveForCorr = kFALSE)  { return Add2List(hist, index, fRawsQAList, saveForCorr) ; }
        virtual Int_t Add2SDigitsList(TH1 * /*hist*/, const Int_t /*index*/)   { return -1 ; } 
        virtual void        Exec(AliQA::TASKINDEX_t task, TObject * data) ;
        virtual Int_t Add2RawsList(TH1 * hist, const Int_t index, const Bool_t saveForCorr = kFALSE)  { return Add2List(hist, index, fRawsQAList, saveForCorr) ; }
        virtual Int_t Add2SDigitsList(TH1 * /*hist*/, const Int_t /*index*/)   { return -1 ; } 
        virtual void        Exec(AliQA::TASKINDEX_t task, TObject * data) ;

+       virtual void        EndOfCycle() ;

        virtual void        EndOfCycle(AliQA::TASKINDEX_t task) ;
        virtual void        EndOfDetectorCycle(AliQA::TASKINDEX_t, TObjArray * ) {AliInfo("To be implemented by detectors");} 
        virtual TH1 *       GetDigitsData(const Int_t /*index*/)    { return NULL ; } 
        virtual TH1 *       GetESDsData(const Int_t index)      { return dynamic_cast<TH1 *>(GetData(fESDsQAList, index)) ; }
        virtual TH1 *       GetHitsData(const Int_t /*index*/)      { return NULL ; }
        virtual TH1 *       GetRecPointsData(const Int_t index) { return dynamic_cast<TH1 *>(GetData(fRecPointsQAList, index)) ; }
        virtual void        EndOfCycle(AliQA::TASKINDEX_t task) ;
        virtual void        EndOfDetectorCycle(AliQA::TASKINDEX_t, TObjArray * ) {AliInfo("To be implemented by detectors");} 
        virtual TH1 *       GetDigitsData(const Int_t /*index*/)    { return NULL ; } 
        virtual TH1 *       GetESDsData(const Int_t index)      { return dynamic_cast<TH1 *>(GetData(fESDsQAList, index)) ; }
        virtual TH1 *       GetHitsData(const Int_t /*index*/)      { return NULL ; }
        virtual TH1 *       GetRecPointsData(const Int_t index) { return dynamic_cast<TH1 *>(GetData(fRecPointsQAList, index)) ; }

-       virtual TH1 *       GetRawsData(const Int_t index)     { return dynamic_cast<TH1 *>(GetData(fRawsQAList, index)) ; }
+       virtual TH1 *       GetRawsData(const Int_t index)     { return fRawsQAList ? dynamic_cast<TH1 *>(GetData(fRawsQAList, index)) : NULL ; }

        virtual TH1 *       GetSDigitsData(const Int_t /*index*/)   { return NULL ; }  
        virtual TH1 *       GetSDigitsData(const Int_t /*index*/)   { return NULL ; }  

-       virtual TObjArray * Init(AliQA::TASKINDEX_t task, Int_t run, Int_t cycles = -1) ;
+       virtual TObjArray * Init(AliQA::TASKINDEX_t task, Int_t cycles = -1) ;

        virtual void        Init(AliQA::TASKINDEX_t task, TObjArray * list, Int_t run, Int_t cycles = -1) ;
        virtual void        Init(AliQA::TASKINDEX_t task, TObjArray * list, Int_t run, Int_t cycles = -1) ;

-       virtual void        StartOfCycle(AliQA::TASKINDEX_t task, const Bool_t sameCycle = kFALSE) ;
+       virtual void        StartOfCycle(Int_t run = -1) ;
+       virtual void        StartOfCycle(AliQA::TASKINDEX_t task, Int_t run, const Bool_t sameCycle = kFALSE) ;

 
        virtual void        SetRecoParam(const AliDetectorRecoParam *param) { fRecoParam = param; }
 
 
        virtual void        SetRecoParam(const AliDetectorRecoParam *param) { fRecoParam = param; }
 


@@ -76,7 +78,7 @@ protected:
        TObjArray *                 fESDsQAList ;      //! list of the ESDs QA data objects
        TObjArray *                 fRawsQAList ;      //! list of the raws QA data objects
        TObjArray *                 fRecPointsQAList ; //! list of the RecPoints QA data objects
        TObjArray *                 fESDsQAList ;      //! list of the ESDs QA data objects
        TObjArray *                 fRawsQAList ;      //! list of the raws QA data objects
        TObjArray *                 fRecPointsQAList ; //! list of the RecPoints QA data objects

-  TObject   *                 fObject ;          //! This is used by Corr only ro hold its Ntuple. Allows to write something else than TH1 to QA data file
+  TObject   *                 fObject ;          //! This is used by Corr only to hold its Ntuple. Allows to write something else than TH1 to QA data file

   const AliDetectorRecoParam *fRecoParam;        //! const pointer to the reco parameters to be used in the reco QA
   
  ClassDef(AliQADataMakerRec,2)  // description 
   const AliDetectorRecoParam *fRecoParam;        //! const pointer to the reco parameters to be used in the reco QA
   
  ClassDef(AliQADataMakerRec,2)  // description 

diff --git a/STEER/AliQADataMakerSim.cxx b/STEER/AliQADataMakerSim.cxx
index 15fc701c5cde7725ce1c7ab9015649e909ba83c7..598e427af9144de174074fd0ca748a0fb0b8d8e4 100644 (file)
--- a/STEER/AliQADataMakerSim.cxx
+++ b/STEER/AliQADataMakerSim.cxx
@@ -88,6 +88,16 @@ AliQADataMakerSim& AliQADataMakerSim::operator = (const AliQADataMakerSim& qadm
   return *this;
 }
 
   return *this;
 }
 

+//____________________________________________________________________________
+void AliQADataMakerSim::EndOfCycle() 
+{ 
+  // Finishes a cycle of QA for all tasks
+  EndOfCycle(AliQA::kHITS) ; 
+  EndOfCycle(AliQA::kSDIGITS) ; 
+  EndOfCycle(AliQA::kDIGITS) ;
+  ResetCycle() ; 
+}
+

 //____________________________________________________________________________
 void AliQADataMakerSim::EndOfCycle(AliQA::TASKINDEX_t task) 
 { 
 //____________________________________________________________________________
 void AliQADataMakerSim::EndOfCycle(AliQA::TASKINDEX_t task) 
 { 


@@ -100,13 +110,16 @@ void AliQADataMakerSim::EndOfCycle(AliQA::TASKINDEX_t task)
                list = fSDigitsQAList ; 
        else if ( task == AliQA::kDIGITS ) 
                list = fDigitsQAList ; 
                list = fSDigitsQAList ; 
        else if ( task == AliQA::kDIGITS ) 
                list = fDigitsQAList ; 

-       
+  
+  if ( ! list ) 
+    return ; 

        EndOfDetectorCycle(task, list) ; 
        TDirectory * subDir = fDetectorDir->GetDirectory(AliQA::GetTaskName(task)) ; 
        if (subDir) { 
                subDir->cd() ; 
                list->Write() ; 
        }
        EndOfDetectorCycle(task, list) ; 
        TDirectory * subDir = fDetectorDir->GetDirectory(AliQA::GetTaskName(task)) ; 
        if (subDir) { 
                subDir->cd() ; 
                list->Write() ; 
        }

+  ResetCycle() ; 

 }
  
 //____________________________________________________________________________
 }
  
 //____________________________________________________________________________


@@ -157,11 +170,10 @@ void AliQADataMakerSim::Exec(AliQA::TASKINDEX_t task, TObject * data)
 }
 
 //____________________________________________________________________________ 
 }
 
 //____________________________________________________________________________ 

-TObjArray *  AliQADataMakerSim::Init(AliQA::TASKINDEX_t task, Int_t run, Int_t cycles)
+TObjArray *  AliQADataMakerSim::Init(AliQA::TASKINDEX_t task, Int_t cycles)

 {
   // general intialisation
        
 {
   // general intialisation
        

-       fRun = run ;

        if (cycles > 0)
                SetCycle(cycles) ;  
        TObjArray * rv = NULL ; 
        if (cycles > 0)
                SetCycle(cycles) ;  
        TObjArray * rv = NULL ; 


@@ -210,14 +222,27 @@ void AliQADataMakerSim::Init(AliQA::TASKINDEX_t task, TObjArray * list, Int_t ru
 }
 
 //____________________________________________________________________________
 }
 
 //____________________________________________________________________________

-void AliQADataMakerSim::StartOfCycle(AliQA::TASKINDEX_t task, const Bool_t sameCycle) 
+void AliQADataMakerSim::StartOfCycle(Int_t run) 
+{ 
+  // Finishes a cycle of QA for all tasks
+  Bool_t samecycle = kFALSE ; 
+  StartOfCycle(AliQA::kHITS,    run, samecycle) ;
+  samecycle = kTRUE ; 
+  StartOfCycle(AliQA::kSDIGITS, run, samecycle) ;
+  StartOfCycle(AliQA::kDIGITS,  run, samecycle) ;
+}
+
+//____________________________________________________________________________
+void AliQADataMakerSim::StartOfCycle(AliQA::TASKINDEX_t task, Int_t run, const Bool_t sameCycle) 

 { 
   // Finishes a cycle of QA data acquistion
 { 
   // Finishes a cycle of QA data acquistion

+  if ( run > 0 ) 
+    fRun = run ; 

        if ( !sameCycle || fCurrentCycle == -1) {
                ResetCycle() ;
        if (fOutput) 
                fOutput->Close() ; 
        if ( !sameCycle || fCurrentCycle == -1) {
                ResetCycle() ;
        if (fOutput) 
                fOutput->Close() ; 

-       fOutput = AliQA::GetQADataFile(GetName(), fRun, fCurrentCycle) ;        
+       fOutput = AliQA::GetQADataFile(GetName(), fRun) ;       

        }       
 
        AliInfo(Form(" Run %d Cycle %d task %s file %s", 
        }       
 
        AliInfo(Form(" Run %d Cycle %d task %s file %s", 


@@ -231,21 +256,6 @@ void AliQADataMakerSim::StartOfCycle(AliQA::TASKINDEX_t task, const Bool_t sameC
        if (!subDir)
                subDir = fDetectorDir->mkdir(AliQA::GetTaskName(task)) ;  
        subDir->cd() ; 
        if (!subDir)
                subDir = fDetectorDir->mkdir(AliQA::GetTaskName(task)) ;  
        subDir->cd() ; 

-       
-       TObjArray * list = 0x0 ; 
-  
-       if ( task == AliQA::kHITS )  
-               list = fHitsQAList ;
-       else if ( task == AliQA::kSDIGITS )  
-               list = fSDigitsQAList ;
-       else  if ( task == AliQA::kDIGITS ) 
-               list = fDigitsQAList ;
-       
-// Should be the choice of detectors
-//     TIter next(list) ;
-//     TH1 * h ; 
-//     while ( (h = dynamic_cast<TH1 *>(next())) )
-//             h->Reset() ;  
-//
+         

        StartOfDetectorCycle() ; 
 }
        StartOfDetectorCycle() ; 
 }

diff --git a/STEER/AliQADataMakerSim.h b/STEER/AliQADataMakerSim.h
index d2e4b3a6e10794e1339a4ef798532082f8ea6d7d..5f1d1f801a68b33df3ffca91dbbd0afb1fc21779 100644 (file)
--- a/STEER/AliQADataMakerSim.h
+++ b/STEER/AliQADataMakerSim.h
@@ -35,6 +35,7 @@ public:
        virtual Int_t Add2RawsList(TH1 * /*hist*/, const Int_t /*index*/, const Bool_t saveForCorr = kFALSE)      { return -1 ; }  
        virtual Int_t Add2SDigitsList(TH1 * hist, const Int_t index)   { return Add2List(hist, index, fSDigitsQAList) ; }
        virtual void        Exec(AliQA::TASKINDEX_t task, TObject * data) ;
        virtual Int_t Add2RawsList(TH1 * /*hist*/, const Int_t /*index*/, const Bool_t saveForCorr = kFALSE)      { return -1 ; }  
        virtual Int_t Add2SDigitsList(TH1 * hist, const Int_t index)   { return Add2List(hist, index, fSDigitsQAList) ; }
        virtual void        Exec(AliQA::TASKINDEX_t task, TObject * data) ;

+       virtual void        EndOfCycle() ;

        virtual void        EndOfCycle(AliQA::TASKINDEX_t task) ;
        virtual void        EndOfDetectorCycle(AliQA::TASKINDEX_t, TObjArray * ) {AliInfo("To be implemented by detectors");} 
        virtual TH1 *       GetDigitsData(const Int_t index)    { return dynamic_cast<TH1 *>(GetData(fDigitsQAList, index)) ; }
        virtual void        EndOfCycle(AliQA::TASKINDEX_t task) ;
        virtual void        EndOfDetectorCycle(AliQA::TASKINDEX_t, TObjArray * ) {AliInfo("To be implemented by detectors");} 
        virtual TH1 *       GetDigitsData(const Int_t index)    { return dynamic_cast<TH1 *>(GetData(fDigitsQAList, index)) ; }


@@ -43,9 +44,10 @@ public:
        virtual TH1 *       GetRecPointsData(const Int_t /*index*/) { return NULL ; }
        virtual TH1 *       GetRawsData(const Int_t /*index*/)      { return NULL ; } 
        virtual TH1 *       GetSDigitsData(const Int_t index)   { return dynamic_cast<TH1 *>(GetData(fSDigitsQAList, index)) ; }
        virtual TH1 *       GetRecPointsData(const Int_t /*index*/) { return NULL ; }
        virtual TH1 *       GetRawsData(const Int_t /*index*/)      { return NULL ; } 
        virtual TH1 *       GetSDigitsData(const Int_t index)   { return dynamic_cast<TH1 *>(GetData(fSDigitsQAList, index)) ; }

-       virtual TObjArray * Init(AliQA::TASKINDEX_t task, Int_t run, Int_t cycles = -1) ;
+       virtual TObjArray * Init(AliQA::TASKINDEX_t task, Int_t cycles = -1) ;

        virtual void        Init(AliQA::TASKINDEX_t task, TObjArray * list, Int_t run, Int_t cycles = -1) ;
        virtual void        Init(AliQA::TASKINDEX_t task, TObjArray * list, Int_t run, Int_t cycles = -1) ;

-       virtual void        StartOfCycle(AliQA::TASKINDEX_t task, const Bool_t sameCycle = kFALSE) ;
+       virtual void        StartOfCycle(Int_t run = -1) ;
+       virtual void        StartOfCycle(AliQA::TASKINDEX_t task, Int_t run, const Bool_t sameCycle = kFALSE) ;

 
 protected: 
        
 
 protected: 
        

diff --git a/STEER/AliQADataMakerSteer.cxx b/STEER/AliQADataMakerSteer.cxx
index a8dbdef2ed3011e1fe21b3576283e42531c39fbe..04891ae017103929eac7009ede094699554191c0 100644 (file)
--- a/STEER/AliQADataMakerSteer.cxx
+++ b/STEER/AliQADataMakerSteer.cxx
@@ -178,8 +178,7 @@ Bool_t AliQADataMakerSteer::DoIt(const AliQA::TASKINDEX_t taskIndex)
                        if (IsSelected(AliQA::GetDetName(iDet))) {
                                AliQADataMaker * qadm = GetQADataMaker(iDet) ;
                                if ( qadm->IsCycleDone() ) {
                        if (IsSelected(AliQA::GetDetName(iDet))) {
                                AliQADataMaker * qadm = GetQADataMaker(iDet) ;
                                if ( qadm->IsCycleDone() ) {

-                                       qadm->EndOfCycle(AliQA::kRAWS) ;
-                                       qadm->StartOfCycle(AliQA::kRAWS) ;
+                                       qadm->EndOfCycle(taskIndex) ;

                                }
                                TTree * data = NULL ; 
                                AliLoader* loader = GetLoader(qadm->GetUniqueID());
                                }
                                TTree * data = NULL ; 
                                AliLoader* loader = GetLoader(qadm->GetUniqueID());


@@ -245,6 +244,7 @@ Bool_t AliQADataMakerSteer::DoIt(const AliQA::TASKINDEX_t taskIndex)
                                } //task switch
                        }
                } // detector loop
                                } //task switch
                        }
                } // detector loop

+    Increment() ; 

        } // event loop 
        // Save QA data for all detectors
        rv = Finish(taskIndex) ;
        } // event loop 
        // Save QA data for all detectors
        rv = Finish(taskIndex) ;


@@ -420,6 +420,19 @@ void  AliQADataMakerSteer::EndOfCycle(TObjArray * detArray)
        }
 }
 
        }
 }
 

+//_____________________________________________________________________________
+void AliQADataMakerSteer::Increment()
+{
+  // Increments the cycle counter for all QA Data Makers
+       for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
+               if (IsSelected(AliQA::GetDetName(iDet))) {
+                       AliQADataMaker * qadm = GetQADataMaker(iDet) ;
+                       if (qadm) 
+        qadm->Increment() ;
+    }
+  }
+}
+  

 //_____________________________________________________________________________
 Bool_t AliQADataMakerSteer::Init(const AliQA::TASKINDEX_t taskIndex, const  char * input )
 {
 //_____________________________________________________________________________
 Bool_t AliQADataMakerSteer::Init(const AliQA::TASKINDEX_t taskIndex, const  char * input )
 {


@@ -485,12 +498,12 @@ Bool_t AliQADataMakerSteer::Init(const AliQA::TASKINDEX_t taskIndex, const  char
        if ( !  AliGeomManager::GetGeometry() ) 
                AliGeomManager::LoadGeometry() ; 
        
        if ( !  AliGeomManager::GetGeometry() ) 
                AliGeomManager::LoadGeometry() ; 
        

-       InitQADataMaker(fRunNumber, fRecoParam, fCycleSame, kTRUE, detArray) ; 
+       InitQADataMaker(fRunNumber, fRecoParam, detArray) ; //, fCycleSame, kTRUE, detArray) ; 

        return kTRUE ; 
 }
 
 //_____________________________________________________________________________
        return kTRUE ; 
 }
 
 //_____________________________________________________________________________

-void  AliQADataMakerSteer::InitQADataMaker(UInt_t run, const AliRecoParam & par, Bool_t sameCycle, Bool_t startOption, TObjArray * detArray) 
+void  AliQADataMakerSteer::InitQADataMaker(UInt_t run, const AliRecoParam & par, TObjArray * detArray) 

 {
        // Initializes The QADataMaker for all active detectors and for all active tasks 
 
 {
        // Initializes The QADataMaker for all active detectors and for all active tasks 
 


@@ -510,13 +523,12 @@ void  AliQADataMakerSteer::InitQADataMaker(UInt_t run, const AliRecoParam & par,
                                }
              // Set default reco params
                                qadm->SetRecoParam(par.GetDetRecoParam(iDet));
                                }
              // Set default reco params
                                qadm->SetRecoParam(par.GetDetRecoParam(iDet));

+        Bool_t sameCycle = kFALSE ; 

                                for (UInt_t taskIndex = 0; taskIndex < AliQA::kNTASKINDEX; taskIndex++) {
                                        if ( fTasks.Contains(Form("%d", taskIndex)) ) {
                                for (UInt_t taskIndex = 0; taskIndex < AliQA::kNTASKINDEX; taskIndex++) {
                                        if ( fTasks.Contains(Form("%d", taskIndex)) ) {

-                                               qadm->Init(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex)), run, GetQACycles(qadm->GetUniqueID())) ;
-                                               if (startOption) {
-                                                       qadm->StartOfCycle(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex)), sameCycle) ;
-                                                       sameCycle = kTRUE ;
-                                               }
+            qadm->StartOfCycle(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex)), run,  sameCycle) ;
+                                               qadm->Init(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex)), GetQACycles(qadm->GetUniqueID())) ;
+            sameCycle = kTRUE ;

                                        }
                                }
                        }
                                        }
                                }
                        }


@@ -723,7 +735,7 @@ void AliQADataMakerSteer::Reset(const Bool_t sameCycle)
        for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                if (IsSelected(AliQA::GetDetName(iDet))) {
                        AliQADataMaker * qadm = GetQADataMaker(iDet);
        for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                if (IsSelected(AliQA::GetDetName(iDet))) {
                        AliQADataMaker * qadm = GetQADataMaker(iDet);

-                       qadm->Reset(sameCycle);
+                       qadm->Reset();

                }
        } 
        if (fRawReaderDelete) { 
                }
        } 
        if (fRawReaderDelete) { 


@@ -846,7 +858,8 @@ TString AliQADataMakerSteer::Run(const char * detectors, const AliQA::TASKINDEX_
 void AliQADataMakerSteer::RunOneEvent(AliRawReader * rawReader) 
 {
        //Runs all the QA data Maker for Raws only and on one event only (event loop done by calling method)
 void AliQADataMakerSteer::RunOneEvent(AliRawReader * rawReader) 
 {
        //Runs all the QA data Maker for Raws only and on one event only (event loop done by calling method)

-
+  if ( ! rawReader ) 
+    return ; 

        AliCodeTimerAuto("") ;
   if (fTasks.Contains(Form("%d", AliQA::kRAWS))){
     for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
        AliCodeTimerAuto("") ;
   if (fTasks.Contains(Form("%d", AliQA::kRAWS))){
     for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {


@@ -855,6 +868,9 @@ void AliQADataMakerSteer::RunOneEvent(AliRawReader * rawReader)
       AliQADataMaker *qadm = GetQADataMaker(iDet);  
       if (!qadm) 
         continue;
       AliQADataMaker *qadm = GetQADataMaker(iDet);  
       if (!qadm) 
         continue;

+      if ( qadm->IsCycleDone() ) {
+        qadm->EndOfCycle() ;
+      }

       AliCodeTimerStart(Form("running RAW quality assurance data maker for %s", AliQA::GetDetName(iDet))); 
                        qadm->Exec(AliQA::kRAWS, rawReader) ;
       AliCodeTimerStop(Form("running RAW quality assurance data maker for %s", AliQA::GetDetName(iDet)));
       AliCodeTimerStart(Form("running RAW quality assurance data maker for %s", AliQA::GetDetName(iDet))); 
                        qadm->Exec(AliQA::kRAWS, rawReader) ;
       AliCodeTimerStop(Form("running RAW quality assurance data maker for %s", AliQA::GetDetName(iDet)));


@@ -875,6 +891,9 @@ void AliQADataMakerSteer::RunOneEvent(AliESDEvent *& esd)
       AliQADataMaker *qadm = GetQADataMaker(iDet);  
       if (!qadm) 
         continue;
       AliQADataMaker *qadm = GetQADataMaker(iDet);  
       if (!qadm) 
         continue;

+      if ( qadm->IsCycleDone() ) {
+        qadm->EndOfCycle() ;
+      }

       AliCodeTimerStart(Form("running ESD quality assurance data maker for %s", AliQA::GetDetName(iDet)));
                        qadm->Exec(AliQA::kESDS, esd) ;
       AliCodeTimerStop(Form("running ESD quality assurance data maker for %s", AliQA::GetDetName(iDet)));
       AliCodeTimerStart(Form("running ESD quality assurance data maker for %s", AliQA::GetDetName(iDet)));
                        qadm->Exec(AliQA::kESDS, esd) ;
       AliCodeTimerStop(Form("running ESD quality assurance data maker for %s", AliQA::GetDetName(iDet)));


@@ -888,15 +907,18 @@ void AliQADataMakerSteer::RunOneEventInOneDetector(Int_t det, TTree * tree)
        // Runs all the QA data Maker for ESDs only and on one event only (event loop done by calling method)
        AliCodeTimerAuto("") ;
   if (fTasks.Contains(Form("%d", AliQA::kRECPOINTS))) {
        // Runs all the QA data Maker for ESDs only and on one event only (event loop done by calling method)
        AliCodeTimerAuto("") ;
   if (fTasks.Contains(Form("%d", AliQA::kRECPOINTS))) {

-    if (!IsSelected(AliQA::GetDetName(det))) {
+    if (IsSelected(AliQA::GetDetName(det))) {

       AliQADataMaker *qadm = GetQADataMaker(det);  
       if (qadm) { 
       AliQADataMaker *qadm = GetQADataMaker(det);  
       if (qadm) { 

+        if ( qadm->IsCycleDone() ) {
+          qadm->EndOfCycle() ;
+        }

         AliCodeTimerStart(Form("running RecPoints quality assurance data maker for %s", AliQA::GetDetName(det)));
         qadm->Exec(AliQA::kRECPOINTS, tree) ;
         AliCodeTimerStart(Form("running RecPoints quality assurance data maker for %s", AliQA::GetDetName(det)));
         qadm->Exec(AliQA::kRECPOINTS, tree) ;

-                               AliCodeTimerStop(Form("running RecPoints quality assurance data maker for %s", AliQA::GetDetName(det)));
-                       }
-               }
-       }
+        AliCodeTimerStop(Form("running RecPoints quality assurance data maker for %s", AliQA::GetDetName(det)));
+      }
+    }
+  }

 }
 
 //_____________________________________________________________________________
 }
 
 //_____________________________________________________________________________

diff --git a/STEER/AliQADataMakerSteer.h b/STEER/AliQADataMakerSteer.h
index 657395ff23d930225f916144fb61a97e9b104768..1b9510c32c9f2f55e7a55458e058b23652251614 100644 (file)
--- a/STEER/AliQADataMakerSteer.h
+++ b/STEER/AliQADataMakerSteer.h
@@ -44,7 +44,8 @@ public:
        UInt_t      GetCurrentEvent() const { return fCurrentEvent ; }
        TObjArray * GetFromOCDB(AliQA::DETECTORINDEX_t det, AliQA::TASKINDEX_t task, const char * year) const ; 
        AliQADataMaker * GetQADataMaker(const Int_t iDet) ; 
        UInt_t      GetCurrentEvent() const { return fCurrentEvent ; }
        TObjArray * GetFromOCDB(AliQA::DETECTORINDEX_t det, AliQA::TASKINDEX_t task, const char * year) const ; 
        AliQADataMaker * GetQADataMaker(const Int_t iDet) ; 

-       void        InitQADataMaker(UInt_t run, const AliRecoParam & par, Bool_t sameCycle, Bool_t startOption=kTRUE, TObjArray * detArray=0x0) ; 
+       void        Increment() ;
+       void        InitQADataMaker(UInt_t run, const AliRecoParam & par, TObjArray * detArray=0x0) ;

        Bool_t      Merge(const Int_t runNumber = -1 ) const ;  
        void        Reset(const Bool_t sameCycle = kFALSE) ;  
        TString     Run(const char * detectors, const AliQA::TASKINDEX_t taskIndex=AliQA::kNULLTASKINDEX, Bool_t const sameCycle = kFALSE, const char * fileName = NULL) ; 
        Bool_t      Merge(const Int_t runNumber = -1 ) const ;  
        void        Reset(const Bool_t sameCycle = kFALSE) ;  
        TString     Run(const char * detectors, const AliQA::TASKINDEX_t taskIndex=AliQA::kNULLTASKINDEX, Bool_t const sameCycle = kFALSE, const char * fileName = NULL) ; 

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 7b8d579e8cdfae8e744687c066e94cc39a83337f..e5163622bd0bae9d789cfa9ed33dcd119d94afd2 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -260,7 +260,6 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename) :
   fQATasks("ALL"), 
   fRunQA(kTRUE),  
   fRunGlobalQA(kTRUE),
   fQATasks("ALL"), 
   fRunQA(kTRUE),  
   fRunGlobalQA(kTRUE),

-  fInLoopQA(kFALSE),

   fSameQACycle(kFALSE),
 
   fRunPlaneEff(kFALSE),
   fSameQACycle(kFALSE),
 
   fRunPlaneEff(kFALSE),


@@ -285,7 +284,6 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename) :
     fTracker[iDet] = NULL;
     fQACycles[iDet] = 999999;  
   }
     fTracker[iDet] = NULL;
     fQACycles[iDet] = 999999;  
   }

-  fQATasks = Form("%d %d %d", AliQA::kRAWS, AliQA::kRECPOINTS, AliQA::kESDS) ; 

   AliPID pid;
 }
 
   AliPID pid;
 }
 


@@ -353,7 +351,6 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   fQATasks(rec.fQATasks), 
   fRunQA(rec.fRunQA),  
   fRunGlobalQA(rec.fRunGlobalQA),
   fQATasks(rec.fQATasks), 
   fRunQA(rec.fRunQA),  
   fRunGlobalQA(rec.fRunGlobalQA),

-  fInLoopQA(rec.fInLoopQA),

   fSameQACycle(rec.fSameQACycle),
   fRunPlaneEff(rec.fRunPlaneEff),
 
   fSameQACycle(rec.fSameQACycle),
   fRunPlaneEff(rec.fRunPlaneEff),
 


@@ -382,7 +379,6 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   for (Int_t i = 0; i < rec.fSpecCDBUri.GetEntriesFast(); i++) {
     if (rec.fSpecCDBUri[i]) fSpecCDBUri.Add(rec.fSpecCDBUri[i]->Clone());
   }
   for (Int_t i = 0; i < rec.fSpecCDBUri.GetEntriesFast(); i++) {
     if (rec.fSpecCDBUri[i]) fSpecCDBUri.Add(rec.fSpecCDBUri[i]->Clone());
   }

-

 }
 
 //_____________________________________________________________________________
 }
 
 //_____________________________________________________________________________


@@ -476,7 +472,6 @@ AliReconstruction& AliReconstruction::operator = (const AliReconstruction& rec)
   fQATasks                     = rec.fQATasks; 
   fRunQA                       = rec.fRunQA;  
   fRunGlobalQA                 = rec.fRunGlobalQA;
   fQATasks                     = rec.fQATasks; 
   fRunQA                       = rec.fRunQA;  
   fRunGlobalQA                 = rec.fRunGlobalQA;

-  fInLoopQA                    = rec.fInLoopQA;

   fSameQACycle                 = rec.fSameQACycle;
   fRunPlaneEff                 = rec.fRunPlaneEff;
 
   fSameQACycle                 = rec.fSameQACycle;
   fRunPlaneEff                 = rec.fRunPlaneEff;
 


@@ -1043,8 +1038,8 @@ Bool_t AliReconstruction::Run(const char* input)
     while ((iEvent < fRunLoader->GetNumberOfEvents()) ||
           (fRawReader && fRawReader->NextEvent())) {
       if (!ProcessEvent(iEvent)) {
     while ((iEvent < fRunLoader->GetNumberOfEvents()) ||
           (fRawReader && fRawReader->NextEvent())) {
       if (!ProcessEvent(iEvent)) {

-       Abort("ProcessEvent",TSelector::kAbortFile);
-       return kFALSE;
+        Abort("ProcessEvent",TSelector::kAbortFile);
+        return kFALSE;

       }
       iEvent++;
     }
       }
       iEvent++;
     }


@@ -1287,40 +1282,31 @@ void AliReconstruction::SlaveBegin(TTree*)
   AliInfo(Form("Current memory usage %d %d", ProcInfo.fMemResident, ProcInfo.fMemVirtual));
   
   //QA
   AliInfo(Form("Current memory usage %d %d", ProcInfo.fMemResident, ProcInfo.fMemVirtual));
   
   //QA

-  fQASteer = new AliQADataMakerSteer("rec") ; 
-  fQASteer->SetActiveDetectors(fQADetectors) ; 
-  fQASteer->SetTasks(fQATasks) ; 
-
-  if ( !fInLoopQA ) {
-    if (fRunQA && fRawReader && fQATasks.Contains(Form("%d", AliQA::kRAWS))) { 
-      fQASteer->Run(fQADetectors, fRawReader) ; 
-      fSameQACycle = kTRUE ; 
-    }
-  }
-       
-  //Initialize the QA and start of cycle for out-of-loop QA
+  //Initialize the QA and start of cycle 

   if (fRunQA) {
   if (fRunQA) {

-    fQASteer->InitQADataMaker(AliCDBManager::Instance()->GetRun(), fRecoParam, fSameQACycle, !fInLoopQA) ;
+    fQASteer = new AliQADataMakerSteer("rec") ; 
+    fQASteer->SetActiveDetectors(fQADetectors) ; 
+    for (Int_t det = 0 ; det < fgkNDetectors ; det++)
+      fQASteer->SetCycleLength(AliQA::DETECTORINDEX_t(det), fQACycles[det]) ;  
+    if (!fRawReader && fQATasks.Contains(AliQA::kRAWS))
+      fQATasks.ReplaceAll(Form("%d",AliQA::kRAWS), "") ;
+    fQASteer->SetTasks(fQATasks) ; 
+    fQASteer->InitQADataMaker(AliCDBManager::Instance()->GetRun(), fRecoParam) ; 

   }
   }

-       
+  

   if (fRunGlobalQA) {
   if (fRunGlobalQA) {

-    fSameQACycle = kFALSE;
+    Bool_t sameCycle = kFALSE ; 

     AliQADataMaker *qadm = fQASteer->GetQADataMaker(AliQA::kGLOBAL);
     AliInfo(Form("Initializing the global QA data maker"));
     if (fQATasks.Contains(Form("%d", AliQA::kRECPOINTS))) {
     AliQADataMaker *qadm = fQASteer->GetQADataMaker(AliQA::kGLOBAL);
     AliInfo(Form("Initializing the global QA data maker"));
     if (fQATasks.Contains(Form("%d", AliQA::kRECPOINTS))) {

-      TObjArray *arr=qadm->Init(AliQA::kRECPOINTS, AliCDBManager::Instance()->GetRun());
+      qadm->StartOfCycle(AliQA::kRECPOINTS, AliCDBManager::Instance()->GetRun(), sameCycle) ; 
+      TObjArray *arr=qadm->Init(AliQA::kRECPOINTS);

       AliTracker::SetResidualsArray(arr);
       AliTracker::SetResidualsArray(arr);

-      if (!fInLoopQA) {
-       qadm->StartOfCycle(AliQA::kRECPOINTS, fSameQACycle);
-       fSameQACycle = kTRUE;
-      }
+      sameCycle = kTRUE ; 

     }
     if (fQATasks.Contains(Form("%d", AliQA::kESDS))) {
     }
     if (fQATasks.Contains(Form("%d", AliQA::kESDS))) {

-      qadm->Init(AliQA::kESDS, AliCDBManager::Instance()->GetRun());
-      if (!fInLoopQA) {
-       qadm->StartOfCycle(AliQA::kESDS, fSameQACycle);
-       fSameQACycle = kTRUE;   
-      }
+      qadm->StartOfCycle(AliQA::kESDS, AliCDBManager::Instance()->GetRun(), sameCycle) ; 
+      qadm->Init(AliQA::kESDS);

     }
   }
 
     }
   }
 


@@ -1393,27 +1379,10 @@ Bool_t AliReconstruction::ProcessEvent(Int_t iEvent)
   GetEventInfo();
   fRecoParam.SetEventSpecie(fRunInfo,fEventInfo);
 
   GetEventInfo();
   fRecoParam.SetEventSpecie(fRunInfo,fEventInfo);
 

-  //Start of cycle for the in-loop QA
-  if (fInLoopQA && fRunQA) {
-    fQASteer->InitQADataMaker(AliCDBManager::Instance()->GetRun(), fRecoParam, fSameQACycle, fInLoopQA) ;
-  }
-  if (fInLoopQA && fRunGlobalQA) {
-    fSameQACycle = kFALSE;
-    AliQADataMaker *qadm = fQASteer->GetQADataMaker(AliQA::kGLOBAL);
-    if (fQATasks.Contains(Form("%d", AliQA::kRECPOINTS))) {
-      qadm->StartOfCycle(AliQA::kRECPOINTS, fSameQACycle);
-      fSameQACycle = kTRUE;
-    }
-    if (fQATasks.Contains(Form("%d", AliQA::kESDS))) {
-      qadm->StartOfCycle(AliQA::kESDS, fSameQACycle);
-      fSameQACycle = kTRUE;
-    }
-  }               
-

   fRunLoader->GetEvent(iEvent);
 
     // QA on single raw 
   fRunLoader->GetEvent(iEvent);
 
     // QA on single raw 

-    if (fInLoopQA && fRunQA) 
+    if (fRunQA) 

                        fQASteer->RunOneEvent(fRawReader) ;  
 
     // local single event reconstruction
                        fQASteer->RunOneEvent(fRawReader) ;  
 
     // local single event reconstruction


@@ -1648,29 +1617,13 @@ Bool_t AliReconstruction::ProcessEvent(Int_t iEvent)
     gSystem->GetProcInfo(&ProcInfo);
     AliInfo(Form("Event %d -> Current memory usage %d %d",iEvent, ProcInfo.fMemResident, ProcInfo.fMemVirtual));
   
     gSystem->GetProcInfo(&ProcInfo);
     AliInfo(Form("Event %d -> Current memory usage %d %d",iEvent, ProcInfo.fMemResident, ProcInfo.fMemVirtual));
   

-
-  // End of cycle for the in-loop  
-    if (fInLoopQA && fRunQA) {
-      fQASteer->RunOneEvent(fesd) ; 
-      fQASteer->EndOfCycle() ;
-    }
-    if (fInLoopQA && fRunGlobalQA) {
-      AliQADataMaker *qadm = fQASteer->GetQADataMaker(AliQA::kGLOBAL);
-      if (qadm) {
-       if (fQATasks.Contains(Form("%d", AliQA::kRECPOINTS))) 
-         qadm->EndOfCycle(AliQA::kRECPOINTS);
-       if (fQATasks.Contains(Form("%d", AliQA::kESDS))) 
-         qadm->EndOfCycle(AliQA::kESDS);
-       qadm->Finish();
-      }
-    }
-

     fEventInfo.Reset();
     for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
       if (fReconstructor[iDet])
                                fReconstructor[iDet]->SetRecoParam(NULL);
     }
        
     fEventInfo.Reset();
     for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
       if (fReconstructor[iDet])
                                fReconstructor[iDet]->SetRecoParam(NULL);
     }
        

+    fQASteer->Increment() ; 

     return kTRUE;
 }
 
     return kTRUE;
 }
 


@@ -1741,20 +1694,21 @@ void AliReconstruction::SlaveTerminate()
    AliWarning("Finish PlaneEff evaluation failed");
   }
 
    AliWarning("Finish PlaneEff evaluation failed");
   }
 

-  //Finish QA and end of cycle for out-of-loop QA
-  if (!fInLoopQA && fRunQA) 
-    fQASteer->Run(fRunLocalReconstruction.Data(), AliQA::kNULLTASKINDEX, fSameQACycle) ; 
-  if (!fInLoopQA && fRunGlobalQA) {
+  // End of cycle for the in-loop  
+  if (fRunQA) {
+    fQASteer->RunOneEvent(fesd) ; 
+    fQASteer->EndOfCycle() ;
+  }
+  if (fRunGlobalQA) {

     AliQADataMaker *qadm = fQASteer->GetQADataMaker(AliQA::kGLOBAL);
     if (qadm) {
       if (fQATasks.Contains(Form("%d", AliQA::kRECPOINTS))) 
     AliQADataMaker *qadm = fQASteer->GetQADataMaker(AliQA::kGLOBAL);
     if (qadm) {
       if (fQATasks.Contains(Form("%d", AliQA::kRECPOINTS))) 

-       qadm->EndOfCycle(AliQA::kRECPOINTS);
+        qadm->EndOfCycle(AliQA::kRECPOINTS);

       if (fQATasks.Contains(Form("%d", AliQA::kESDS))) 
       if (fQATasks.Contains(Form("%d", AliQA::kESDS))) 

-       qadm->EndOfCycle(AliQA::kESDS);
+        qadm->EndOfCycle(AliQA::kESDS);

       qadm->Finish();
     }
   }
       qadm->Finish();
     }
   }

-

   gROOT->cd();
   CleanUp();
 }
   gROOT->cd();
   CleanUp();
 }


@@ -1837,9 +1791,8 @@ Bool_t AliReconstruction::RunLocalEventReconstruction(const TString& detectors)
       loader->UnloadDigits();
     }
 
       loader->UnloadDigits();
     }
 

-    // In-loop QA for local reconstrucion 

                TString detQAStr(fQADetectors) ; 
                TString detQAStr(fQADetectors) ; 

-               if (fRunQA && fInLoopQA) 
+               if (fRunQA) 

                        fQASteer->RunOneEventInOneDetector(iDet, clustersTree) ; 
     
        loader->WriteRecPoints("OVERWRITE");
                        fQASteer->RunOneEventInOneDetector(iDet, clustersTree) ; 
     
        loader->WriteRecPoints("OVERWRITE");

diff --git a/STEER/AliReconstruction.h b/STEER/AliReconstruction.h
index 0b3a1549e6f17f8ed9674089b7ba91d4de96feae..02eb818377d752d19f3e4e4ed040273fea09a916 100644 (file)
--- a/STEER/AliReconstruction.h
+++ b/STEER/AliReconstruction.h
@@ -40,6 +40,7 @@ class TMap;
 class AliRecoParam;
 class AliDetectorRecoParam;
 class AliRunInfo;
 class AliRecoParam;
 class AliDetectorRecoParam;
 class AliRunInfo;

+#include "AliQA.h"

 #include "AliEventInfo.h"
 #include "AliRecoParam.h"
 
 #include "AliEventInfo.h"
 #include "AliRecoParam.h"
 


@@ -139,10 +140,9 @@ public:
   void        ImportRunLoader(AliRunLoader* rl) { fRunLoader = rl; }
 
   // Quality Assurance 
   void        ImportRunLoader(AliRunLoader* rl) { fRunLoader = rl; }
 
   // Quality Assurance 

-  void    SetQACycles(const char * detector, const Int_t cycles) { fQACycles[GetDetIndex(detector)] = cycles ; }
+  void    SetQACycles(AliQA::DETECTORINDEX_t det, const Int_t cycles) { fQACycles[det] = cycles ; }

   Bool_t  SetRunQA(TString detAndAction="ALL:ALL") ; 
   void    SetRunGlobalQA(Bool_t flag=kTRUE){fRunGlobalQA = flag;}
   Bool_t  SetRunQA(TString detAndAction="ALL:ALL") ; 
   void    SetRunGlobalQA(Bool_t flag=kTRUE){fRunGlobalQA = flag;}

-  void    SetInLoopQA(Bool_t flag=kTRUE)   {fInLoopQA    = flag;} 

 
   // Plane Efficiency Evaluation
   void    SetRunPlaneEff(Bool_t flag=kFALSE)  {fRunPlaneEff = flag;}
 
   // Plane Efficiency Evaluation
   void    SetRunPlaneEff(Bool_t flag=kFALSE)  {fRunPlaneEff = flag;}


@@ -158,9 +158,9 @@ private:
 
   void           InitRun(const char* input);
   void           InitRawReader(const char* input);
 
   void           InitRun(const char* input);
   void           InitRawReader(const char* input);

-  void                  InitCDB();
-  Bool_t        InitGRP();
-  void                  SetCDBLock();
+  void           InitCDB();
+  Bool_t         InitGRP();
+  void           SetCDBLock();

   Bool_t         SetRunNumberFromData();
   Bool_t         LoadCDB();
   Bool_t         RunLocalEventReconstruction(const TString& detectors);
   Bool_t         SetRunNumberFromData();
   Bool_t         LoadCDB();
   Bool_t         RunLocalEventReconstruction(const TString& detectors);


@@ -185,7 +185,6 @@ private:
   void           FillRawDataErrorLog(Int_t iEvent, AliESDEvent* esd);
 
   //Quality Assurance
   void           FillRawDataErrorLog(Int_t iEvent, AliESDEvent* esd);
 
   //Quality Assurance

-  const Int_t          GetQACycles(const char * detector) { return fQACycles[GetDetIndex(detector)] ; }

   void                 CheckQA() ;
 
   // Plane Efficiency evaluation
   void                 CheckQA() ;
 
   // Plane Efficiency evaluation


@@ -272,7 +271,6 @@ private:
   TString               fQATasks ;      // list of QA tasks to be performed    
   Bool_t                fRunQA ;        // Run QA flag
   Bool_t                fRunGlobalQA;   // Run global QA flag
   TString               fQATasks ;      // list of QA tasks to be performed    
   Bool_t                fRunQA ;        // Run QA flag
   Bool_t                fRunGlobalQA;   // Run global QA flag

-  Bool_t                fInLoopQA;      // In-loop QA flag

   Bool_t                fSameQACycle;   //! open a new QA data file or not
   // Plane Efficiency Evaluation
   Bool_t         fRunPlaneEff ;      // Evaluate Plane Efficiency
   Bool_t                fSameQACycle;   //! open a new QA data file or not
   // Plane Efficiency Evaluation
   Bool_t         fRunPlaneEff ;      // Evaluate Plane Efficiency

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 5417536f3a8a851f36342da45523eaee730f94ed..eb0d046e7caa837df58b73705cf2b561baa72558 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -139,7 +139,6 @@
 #include "AliGenEventHeader.h"
 #include "AliMC.h"
 #include "AliHLTSimulation.h"
 #include "AliGenEventHeader.h"
 #include "AliMC.h"
 #include "AliHLTSimulation.h"

-#include "AliQADataMakerSteer.h"

 #include "AliSysInfo.h"
 #include "AliMagF.h"
 
 #include "AliSysInfo.h"
 #include "AliMagF.h"
 


@@ -195,8 +194,6 @@ AliSimulation::AliSimulation(const char* configFileName,
   SetGAliceFile("galice.root");
   
 // for QA
   SetGAliceFile("galice.root");
   
 // for QA

-   for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) 
-                fQACycles[iDet] = 999999;

        fQASteer = new AliQADataMakerSteer("sim") ; 
        fQASteer->SetActiveDetectors(fQADetectors) ; 
        fQATasks = Form("%d %d %d", AliQA::kHITS, AliQA::kSDIGITS, AliQA::kDIGITS) ; 
        fQASteer = new AliQADataMakerSteer("sim") ; 
        fQASteer->SetActiveDetectors(fQADetectors) ; 
        fQATasks = Form("%d %d %d", AliQA::kHITS, AliQA::kSDIGITS, AliQA::kDIGITS) ; 


@@ -261,10 +258,6 @@ AliSimulation::AliSimulation(const AliSimulation& sim) :
     if (sim.fSpecCDBUri[i]) fSpecCDBUri.Add(sim.fSpecCDBUri[i]->Clone());
   }
   fgInstance = this;
     if (sim.fSpecCDBUri[i]) fSpecCDBUri.Add(sim.fSpecCDBUri[i]->Clone());
   }
   fgInstance = this;

-
-// for QA
-   for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) 
-       fQACycles[iDet] = sim.fQACycles[iDet];

 }
 
 //_____________________________________________________________________________
 }
 
 //_____________________________________________________________________________

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index dc0d6baa2196c79a665eba7e8f30e605cd789417..d7e145395e7c8bdc651552f3b0eebeb74fd7c418 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -16,11 +16,11 @@
 #include <TString.h>
 #include <TObjArray.h>
 #include "AliQA.h"
 #include <TString.h>
 #include <TObjArray.h>
 #include "AliQA.h"

+#include "AliQADataMakerSteer.h"

 
 class AliCDBId;
 class AliCDBParam;
 class AliRunLoader;
 
 class AliCDBId;
 class AliCDBParam;
 class AliRunLoader;

-class AliQADataMakerSteer ; 

 
 class AliSimulation: public TNamed {
 public:
 
 class AliSimulation: public TNamed {
 public:


@@ -105,8 +105,7 @@ public:
 
   //Quality Assurance
   Int_t       GetDetIndex(const char * detector);
 
   //Quality Assurance
   Int_t       GetDetIndex(const char * detector);

-  const Int_t GetQACycles(const char * detector) { return fQACycles[GetDetIndex(detector)] ; }
-  void        SetQACycles(const char * detector, const Int_t cycles) { fQACycles[GetDetIndex(detector)] = cycles ; }
+  void        SetQACycles(AliQA::DETECTORINDEX_t det, const Int_t cycles) {  fQASteer->SetCycleLength(det, cycles) ; }

   Bool_t      RunQA() ;
   Bool_t      SetRunQA(TString detAndAction="ALL:ALL") ; 
 
   Bool_t      RunQA() ;
   Bool_t      SetRunQA(TString detAndAction="ALL:ALL") ; 
 


@@ -161,7 +160,6 @@ private:
   //QA stuff
   static const Int_t   fgkNDetectors = 15 ;             // number of detectors
   static const char *  fgkDetectorName[fgkNDetectors] ; // names of detectors
   //QA stuff
   static const Int_t   fgkNDetectors = 15 ;             // number of detectors
   static const char *  fgkDetectorName[fgkNDetectors] ; // names of detectors

-  Int_t                fQACycles[fgkNDetectors] ;       // cycle length (# events) over which QA data are accumulated

   TString              fQADetectors ;                   // list of detectors to be QA'ed       
   TString              fQATasks ;                       // list of QA tasks to be performed    
        AliQADataMakerSteer * fQASteer ;                      // steering object to run QA
   TString              fQADetectors ;                   // list of detectors to be QA'ed       
   TString              fQATasks ;                       // list of QA tasks to be performed    
        AliQADataMakerSteer * fQASteer ;                      // steering object to run QA

diff --git a/test/QA/Config.C b/test/QA/Config.C
index dff54330b1e5b91c4e2ef6c149fbb5820301e881..f373dbcea23c1a6488e377b5d3b730c99da2648a 100644 (file)
--- a/test/QA/Config.C
+++ b/test/QA/Config.C
@@ -411,12 +411,12 @@ void Config()
   Int_t iACORDE= 1;
   Int_t iDIPO  = 1;
   Int_t iEMCAL = 1;
   Int_t iACORDE= 1;
   Int_t iDIPO  = 1;
   Int_t iEMCAL = 1;

-  Int_t iFMD   = 1;
+  Int_t iFMD   = 0;

   Int_t iFRAME = 1;
   Int_t iHALL  = 1;
   Int_t iITS   = 1;
   Int_t iMAG   = 1;
   Int_t iFRAME = 1;
   Int_t iHALL  = 1;
   Int_t iITS   = 1;
   Int_t iMAG   = 1;

-  Int_t iMUON  = 1;
+  Int_t iMUON  = 0;

   Int_t iPHOS  = 1;
   Int_t iPIPE  = 1;
   Int_t iPMD   = 1;
   Int_t iPHOS  = 1;
   Int_t iPIPE  = 1;
   Int_t iPMD   = 1;

diff --git a/test/QA/rec.C b/test/QA/rec.C
index 9a05c7c434710258ae28b5df299153e18b456268..a0b527572b26e79d535d5fa7fbf9aced353f75ed 100644 (file)
--- a/test/QA/rec.C
+++ b/test/QA/rec.C
@@ -1,4 +1,4 @@
-void rec() {
+ void rec() {

   const char * kYear = "08" ; 
   AliCDBManager * man = AliCDBManager::Instance();
   //man->SetDefaultStorage("alien://Folder=/alice/data/2008/LHC08c/OCDB/");
   const char * kYear = "08" ; 
   AliCDBManager * man = AliCDBManager::Instance();
   //man->SetDefaultStorage("alien://Folder=/alice/data/2008/LHC08c/OCDB/");


@@ -19,11 +19,14 @@ void rec() {
 //  reco.SetRunReconstruction("ITS TPC TRD TOF HMPID PHOS EMCAL MUON T0 VZERO FMD PMD ZDC ACORDE");
   reco.SetRunReconstruction("ITS TPC TRD HMPID PHOS EMCAL MUON T0 VZERO FMD PMD ZDC ACORDE");
   reco.SetRunQA("ALL:ALL") ;
 //  reco.SetRunReconstruction("ITS TPC TRD TOF HMPID PHOS EMCAL MUON T0 VZERO FMD PMD ZDC ACORDE");
   reco.SetRunReconstruction("ITS TPC TRD HMPID PHOS EMCAL MUON T0 VZERO FMD PMD ZDC ACORDE");
   reco.SetRunQA("ALL:ALL") ;

-        reco.SetInLoopQA() ; 

          
        // AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
   AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
   
          
        // AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
   AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
   

+  for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
+    reco.SetQACycles(det, 2) ;
+  }
+  

 // **** The field map settings must be the same as in Config.C !
   AliMagFMaps *field=new AliMagFMaps("Maps","Maps",2,1.,10.,AliMagFMaps::k5kG);
   Bool_t uniform=kFALSE;
 // **** The field map settings must be the same as in Config.C !
   AliMagFMaps *field=new AliMagFMaps("Maps","Maps",2,1.,10.,AliMagFMaps::k5kG);
   Bool_t uniform=kFALSE;

diff --git a/test/QA/recraw.C b/test/QA/recraw.C
index 74ec5f78efc048ea07df0854f29824b61f1e49e9..2f3ae5902a80a149b8051348aae7090c657b24b4 100644 (file)
--- a/test/QA/recraw.C
+++ b/test/QA/recraw.C
@@ -49,10 +49,12 @@ void recraw() {
        // switch off cleanESD
   reco.SetCleanESD(kFALSE);
        
        // switch off cleanESD
   reco.SetCleanESD(kFALSE);
        

-        reco.SetInLoopQA() ; 

        reco.SetRunQA("ALL:ALL") ;
        //AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
   AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
        reco.SetRunQA("ALL:ALL") ;
        //AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
   AliQA::SetQARefStorage("local://$ALICE_ROOT") ;

+  for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
+    reco.SetQACycles(det, 2) ;
+  }

   
   AliLog::Flush();
        
   
   AliLog::Flush();
        

diff --git a/test/QA/sim.C b/test/QA/sim.C
index 55ae3bacf5e9e2c39f0381da05f9d6de01c02be0..a261f4c8b114bcb49ff67bc3728d015e3b9ea9be 100644 (file)
--- a/test/QA/sim.C
+++ b/test/QA/sim.C
@@ -1,8 +1,10 @@
-void sim(Int_t nev=1) {
+void sim(Int_t nev=4) {

   const char * kYear = "08" ; 
   AliSimulation simu;
   const char * kYear = "08" ; 
   AliSimulation simu;

-  simu.SetMakeSDigits("TRD TOF PHOS HMPID  EMCAL MUON FMD PMD T0 ZDC VZERO");
-  simu.SetMakeDigits ("TRD TOF PHOS HMPID  EMCAL MUON FMD PMD T0 ZDC VZERO");
+//  simu.SetMakeSDigits("TRD TOF PHOS HMPID  EMCAL MUON FMD PMD T0 ZDC VZERO");
+  simu.SetMakeSDigits("TRD TOF PHOS HMPID  EMCAL PMD T0 ZDC VZERO");
+  simu.SetMakeDigits ("TRD TOF PHOS HMPID  EMCAL PMD T0 ZDC VZERO");
+//  simu.SetMakeDigits ("TRD TOF PHOS HMPID  EMCAL MUON FMD PMD T0 ZDC VZERO");

   simu.SetMakeDigitsFromHits("ITS TPC");
   simu.SetWriteRawData("ALL","raw.root",kTRUE);
 //  simu.SetDefaultStorage("alien://Folder=/alice/data/2008/LHC08c/OCDB/");
   simu.SetMakeDigitsFromHits("ITS TPC");
   simu.SetWriteRawData("ALL","raw.root",kTRUE);
 //  simu.SetDefaultStorage("alien://Folder=/alice/data/2008/LHC08c/OCDB/");


@@ -13,7 +15,10 @@ void sim(Int_t nev=1) {
  // AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
   AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
   // AliQA::SetQARefDataDirName(AliQA::kMONTECARLO) ; //RUN_TYPE
  // AliQA::SetQARefStorage(Form("%s%s/", AliQA::GetQARefDefaultStorage(), kYear)) ;
   AliQA::SetQARefStorage("local://$ALICE_ROOT") ;
   // AliQA::SetQARefDataDirName(AliQA::kMONTECARLO) ; //RUN_TYPE

-
+  for (Int_t det = 0 ; det < AliQA::kNDET ; det++) {
+    simu.SetQACycles(det, 2) ;
+  }
+  

   TStopwatch timer;
   timer.Start();
   simu.Run(nev);
   TStopwatch timer;
   timer.Start();
   simu.Run(nev);

diff --git a/test/cosmic/rec.C b/test/cosmic/rec.C
index 4588ffddb1ee72c16fd902cd92cda84cc3d34ae5..bcc7a2a231ee8a347e93e5aa96c9ce0002e0e90a 100644 (file)
--- a/test/cosmic/rec.C
+++ b/test/cosmic/rec.C
@@ -17,8 +17,8 @@ void rec(const char *filename="raw.root", const Int_t mfield=1)
 \r
   // Set the CDB storage location\r
   AliCDBManager * man = AliCDBManager::Instance();\r
 \r
   // Set the CDB storage location\r
   AliCDBManager * man = AliCDBManager::Instance();\r

-  //  man->SetDefaultStorage("local://$ALICE_ROOT");\r
-  man->SetDefaultStorage("alien://folder=/alice/data/2008/LHC08b/OCDB/");\r
+    man->SetDefaultStorage("local://$ALICE_ROOT");\r
+  //man->SetDefaultStorage("alien://folder=/alice/data/2008/LHC08a/OCDB/");\r

   man->SetSpecificStorage("ITS/Calib/*","local://$ALICE_ROOT");\r
   \r
   // Example in case a specific CDB storage is needed\r
   man->SetSpecificStorage("ITS/Calib/*","local://$ALICE_ROOT");\r
   \r
   // Example in case a specific CDB storage is needed\r