From b827483444e7e6860618c8995f510b037fa606f2 Mon Sep 17 00:00:00 2001 From: schutz Date: Wed, 10 Oct 2007 09:05:10 +0000 Subject: [PATCH] Changing name QualAss to QA --- PHOS/AliPHOS.cxx | 5 +- PHOS/AliPHOSDigitizer.cxx | 35 ++++++----- PHOS/AliPHOSDigitizer.h | 9 ++- ...ualAssChecker.cxx => AliPHOSQAChecker.cxx} | 14 ++--- PHOS/AliPHOSQAChecker.h | 41 +++++++++++++ ...ssDataMaker.cxx => AliPHOSQADataMaker.cxx} | 58 +++++++++---------- ...ualAssDataMaker.h => AliPHOSQADataMaker.h} | 22 +++---- PHOS/AliPHOSQualAssChecker.h | 41 ------------- PHOS/AliPHOSSDigitizer.cxx | 47 ++++++++------- PHOS/AliPHOSSDigitizer.h | 9 ++- PHOS/AliPHOSTrackSegmentMakerv1.cxx | 5 +- PHOS/AliPHOSTracker.cxx | 5 +- PHOS/PHOSbaseLinkDef.h | 4 +- PHOS/libPHOSbase.pkg | 4 +- 14 files changed, 160 insertions(+), 139 deletions(-) rename PHOS/{AliPHOSQualAssChecker.cxx => AliPHOSQAChecker.cxx} (84%) create mode 100644 PHOS/AliPHOSQAChecker.h rename PHOS/{AliPHOSQualAssDataMaker.cxx => AliPHOSQADataMaker.cxx} (88%) rename PHOS/{AliPHOSQualAssDataMaker.h => AliPHOSQADataMaker.h} (67%) delete mode 100644 PHOS/AliPHOSQualAssChecker.h diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx index ec12ad26aae..df46d74aaa1 100644 --- a/PHOS/AliPHOS.cxx +++ b/PHOS/AliPHOS.cxx @@ -16,6 +16,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.115 2007/08/22 09:20:50 hristov + * Updated QA classes (Yves) + * * Revision 1.114 2007/08/07 14:12:03 kharlov * Quality assurance added (Yves Schutz) * @@ -89,7 +92,7 @@ class TFile; #include "AliDAQ.h" #include "AliPHOSRawDecoder.h" #include "AliPHOSRawDigiProducer.h" -#include "AliPHOSQualAssChecker.h" +#include "AliPHOSQAChecker.h" ClassImp(AliPHOS) diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx index cc874cc9231..af82d504d6b 100644 --- a/PHOS/AliPHOSDigitizer.cxx +++ b/PHOS/AliPHOSDigitizer.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.99 2007/09/30 17:08:20 schutz + * Introducing the notion of QA data acquisition cycle (needed by online) + * * Revision 1.98 2007/09/26 14:22:17 cvetan * Important changes to the reconstructor classes. Complete elimination of the run-loaders, which are now steered only from AliReconstruction. Removal of the corresponding Reconstruct() and FillESD() methods. * @@ -118,7 +121,7 @@ #include "AliPHOSSDigitizer.h" #include "AliPHOSGeometry.h" #include "AliPHOSTick.h" -#include "AliPHOSQualAssDataMaker.h" +#include "AliPHOSQADataMaker.h" ClassImp(AliPHOSDigitizer) @@ -193,12 +196,12 @@ AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, fDefaultInit = kFALSE ; fManager = 0 ; // We work in the standalong mode //Initialize the quality assurance data maker only once - fQADM = new AliPHOSQualAssDataMaker() ; + fQADM = new AliPHOSQADataMaker() ; //FIXME: get the run number Int_t run = 0 ; //EMXIF - GetQualAssDataMaker()->Init(AliQualAss::kDIGITS, run, fgkCycles) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kDIGITS) ; + GetQADataMaker()->Init(AliQA::kDIGITS, run, fgkCycles) ; + GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ; } //____________________________________________________________________________ @@ -238,8 +241,8 @@ AliPHOSDigitizer::AliPHOSDigitizer(const AliPHOSDigitizer & d) : //FIXME: get the run number Int_t run = 0 ; //EMXIF - GetQualAssDataMaker()->Init(AliQualAss::kDIGITS, run, fgkCycles) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kDIGITS) ; + GetQADataMaker()->Init(AliQA::kDIGITS, run, fgkCycles) ; + GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ; } //____________________________________________________________________________ @@ -278,12 +281,12 @@ AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd) : InitParameters() ; fDefaultInit = kFALSE ; //Initialize the quality assurance data maker only once - fQADM = new AliPHOSQualAssDataMaker() ; + fQADM = new AliPHOSQADataMaker() ; //FIXME: get the run number Int_t run = 0 ; //EMXIF - GetQualAssDataMaker()->Init(AliQualAss::kDIGITS, run) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kDIGITS) ; + GetQADataMaker()->Init(AliQA::kDIGITS, run) ; + GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ; } //____________________________________________________________________________ @@ -643,12 +646,12 @@ void AliPHOSDigitizer::Exec(Option_t *option) Digitize(ievent) ; //Add prepared SDigits to digits and add the noise //makes the quality assurance data - if (GetQualAssDataMaker()->IsCycleDone() ) { - GetQualAssDataMaker()->EndOfCycle(AliQualAss::kDIGITS) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kDIGITS) ; + if (GetQADataMaker()->IsCycleDone() ) { + GetQADataMaker()->EndOfCycle(AliQA::kDIGITS) ; + GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ; } - GetQualAssDataMaker()->Exec(AliQualAss::kDIGITS, gime->Digits()) ; - GetQualAssDataMaker()->Increment() ; + GetQADataMaker()->Exec(AliQA::kDIGITS, gime->Digits()) ; + GetQADataMaker()->Increment() ; WriteDigits() ; @@ -661,8 +664,8 @@ void AliPHOSDigitizer::Exec(Option_t *option) //Write the quality assurance data only after the last event if ( fEventCounter == gime->MaxEvent() ) { - GetQualAssDataMaker()->EndOfCycle(AliQualAss::kDIGITS) ; - GetQualAssDataMaker()->Finish(AliQualAss::kDIGITS) ; + GetQADataMaker()->EndOfCycle(AliQA::kDIGITS) ; + GetQADataMaker()->Finish(AliQA::kDIGITS) ; } gime->PhosLoader()->CleanDigitizer(); diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h index d47b45b8d6f..aefc71ffbf6 100644 --- a/PHOS/AliPHOSDigitizer.h +++ b/PHOS/AliPHOSDigitizer.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.36 2007/09/30 17:08:20 schutz + * Introducing the notion of QA data acquisition cycle (needed by online) + * * Revision 1.35 2007/08/07 14:12:03 kharlov * Quality assurance added (Yves Schutz) * @@ -38,7 +41,7 @@ class TClonesArray ; // --- AliRoot header files --- #include "AliDigitizer.h" class AliPHOSSDigitizer ; -class AliPHOSQualAssDataMaker ; +class AliPHOSQADataMaker ; class AliRunDigitizer ; class AliPHOSDigitizer: public AliDigitizer { @@ -97,7 +100,7 @@ public: private: - AliPHOSQualAssDataMaker * GetQualAssDataMaker() const { return fQADM ; } + AliPHOSQADataMaker * GetQADataMaker() const { return fQADM ; } virtual Bool_t Init() ; void InitParameters() ; @@ -146,7 +149,7 @@ private: TString fEventFolderName; // skowron: name of EFN to read data from in stand alone mode Int_t fFirstEvent; // first event to process Int_t fLastEvent; // last event to process - AliPHOSQualAssDataMaker * fQADM ; //!Quality Assurance Data Maker + AliPHOSQADataMaker * fQADM ; //!Quality Assurance Data Maker Int_t fEventCounter ; //! counts the events processed //QA stuff diff --git a/PHOS/AliPHOSQualAssChecker.cxx b/PHOS/AliPHOSQAChecker.cxx similarity index 84% rename from PHOS/AliPHOSQualAssChecker.cxx rename to PHOS/AliPHOSQAChecker.cxx index 99cbbba0c9a..a4c42da70f4 100644 --- a/PHOS/AliPHOSQualAssChecker.cxx +++ b/PHOS/AliPHOSQAChecker.cxx @@ -34,18 +34,18 @@ // --- AliRoot header files --- #include "AliLog.h" -#include "AliQualAss.h" -#include "AliQualAssChecker.h" -#include "AliPHOSQualAssChecker.h" +#include "AliQA.h" +#include "AliQAChecker.h" +#include "AliPHOSQAChecker.h" -ClassImp(AliPHOSQualAssChecker) +ClassImp(AliPHOSQAChecker) //__________________________________________________________________ -AliPHOSQualAssChecker& AliPHOSQualAssChecker::operator = (const AliPHOSQualAssChecker& qac ) +AliPHOSQAChecker& AliPHOSQAChecker::operator = (const AliPHOSQAChecker& qac ) { // Equal operator. - this->~AliPHOSQualAssChecker(); - new(this) AliPHOSQualAssChecker(qac); + this->~AliPHOSQAChecker(); + new(this) AliPHOSQAChecker(qac); return *this; } diff --git a/PHOS/AliPHOSQAChecker.h b/PHOS/AliPHOSQAChecker.h new file mode 100644 index 00000000000..b5d5e9285e7 --- /dev/null +++ b/PHOS/AliPHOSQAChecker.h @@ -0,0 +1,41 @@ +#ifndef ALIPHOSQACHECKER_H +#define ALIPHOSQACHECKER_H +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ + + +/* $Id$ */ + +/* + Checks the quality assurance. + By comparing with reference data + Y. Schutz CERN July 2007 +*/ + + +// --- ROOT system --- +class TFile ; +class TH1F ; +class TH1I ; + +// --- Standard library --- + +// --- AliRoot header files --- +#include "AliQACheckerBase.h" +class AliPHOSLoader ; + +class AliPHOSQAChecker: public AliQACheckerBase { + +public: + AliPHOSQAChecker() : AliQACheckerBase("PHOS","PHOS Quality Assurance Data Maker") {;} // ctor + AliPHOSQAChecker(const AliPHOSQAChecker& qac) : AliQACheckerBase(qac.GetName(), qac.GetTitle()) {;} // cpy ctor + AliPHOSQAChecker& operator = (const AliPHOSQAChecker& qac) ; + virtual ~AliPHOSQAChecker() {;} // dtor + +private: + + ClassDef(AliPHOSQAChecker,1) // description + +}; + +#endif // AliPHOSQAChecker_H diff --git a/PHOS/AliPHOSQualAssDataMaker.cxx b/PHOS/AliPHOSQADataMaker.cxx similarity index 88% rename from PHOS/AliPHOSQualAssDataMaker.cxx rename to PHOS/AliPHOSQADataMaker.cxx index 4e7b9fbb439..6d58127f8a5 100644 --- a/PHOS/AliPHOSQualAssDataMaker.cxx +++ b/PHOS/AliPHOSQADataMaker.cxx @@ -37,26 +37,26 @@ #include "AliLog.h" #include "AliPHOSDigit.h" #include "AliPHOSHit.h" -#include "AliPHOSQualAssDataMaker.h" -#include "AliQualAssChecker.h" +#include "AliPHOSQADataMaker.h" +#include "AliQAChecker.h" #include "AliPHOSCpvRecPoint.h" #include "AliPHOSEmcRecPoint.h" #include "AliPHOSRecParticle.h" #include "AliPHOSTrackSegment.h" #include "AliPHOSRawDecoder.h" -ClassImp(AliPHOSQualAssDataMaker) +ClassImp(AliPHOSQADataMaker) //____________________________________________________________________________ - AliPHOSQualAssDataMaker::AliPHOSQualAssDataMaker() : - AliQualAssDataMaker(AliQualAss::GetDetName(AliQualAss::kPHOS), "PHOS Quality Assurance Data Maker") + AliPHOSQADataMaker::AliPHOSQADataMaker() : + AliQADataMaker(AliQA::GetDetName(AliQA::kPHOS), "PHOS Quality Assurance Data Maker") { // ctor } //____________________________________________________________________________ -AliPHOSQualAssDataMaker::AliPHOSQualAssDataMaker(const AliPHOSQualAssDataMaker& qadm) : - AliQualAssDataMaker() +AliPHOSQADataMaker::AliPHOSQADataMaker(const AliPHOSQADataMaker& qadm) : + AliQADataMaker() { //copy ctor SetName((const char*)qadm.GetName()) ; @@ -64,24 +64,24 @@ AliPHOSQualAssDataMaker::AliPHOSQualAssDataMaker(const AliPHOSQualAssDataMaker& } //__________________________________________________________________ -AliPHOSQualAssDataMaker& AliPHOSQualAssDataMaker::operator = (const AliPHOSQualAssDataMaker& qadm ) +AliPHOSQADataMaker& AliPHOSQADataMaker::operator = (const AliPHOSQADataMaker& qadm ) { // Equal operator. - this->~AliPHOSQualAssDataMaker(); - new(this) AliPHOSQualAssDataMaker(qadm); + this->~AliPHOSQADataMaker(); + new(this) AliPHOSQADataMaker(qadm); return *this; } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::EndOfDetectorCycle(AliQualAss::TASKINDEX task, TList * list) +void AliPHOSQADataMaker::EndOfDetectorCycle(AliQA::TASKINDEX task, TList * list) { //Detector specific actions at end of cycle // do the QA checking - AliQualAssChecker::Instance()->Run(AliQualAss::kPHOS, task, list) ; + AliQAChecker::Instance()->Run(AliQA::kPHOS, task, list) ; } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::InitESDs() +void AliPHOSQADataMaker::InitESDs() { //create ESDs histograms in ESDs subdir TH1F * h0 = new TH1F("hPhosESDs", "ESDs energy distribution in PHOS", 100, 0., 100.) ; @@ -93,7 +93,7 @@ void AliPHOSQualAssDataMaker::InitESDs() } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::InitHits() +void AliPHOSQADataMaker::InitHits() { // create Hits histograms in Hits subdir TH1F * h0 = new TH1F("hPhosHits", "Hits energy distribution in PHOS", 100, 0., 100.) ; @@ -105,7 +105,7 @@ void AliPHOSQualAssDataMaker::InitHits() } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::InitDigits() +void AliPHOSQADataMaker::InitDigits() { // create Digits histograms in Digits subdir TH1I * h0 = new TH1I("hPhosDigits", "Digits amplitude distribution in PHOS", 500, 0, 5000) ; @@ -117,7 +117,7 @@ void AliPHOSQualAssDataMaker::InitDigits() } //____________________________________________________________________________ -//void AliPHOSQualAssDataMaker::InitRecParticles() +//void AliPHOSQADataMaker::InitRecParticles() //{ // // create Reconstructed particles histograms in RecParticles subdir // fhRecParticles = new TH1F("hPhosRecParticles", "RecParticles energy distribution in PHOS", 100, 0., 100.) ; @@ -127,7 +127,7 @@ void AliPHOSQualAssDataMaker::InitDigits() //} //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::InitRecPoints() +void AliPHOSQADataMaker::InitRecPoints() { // create Reconstructed Points histograms in RecPoints subdir TH1F * h0 = new TH1F("hEmcPhosRecPoints", "EMCA RecPoints energy distribution in PHOS", 100, 0., 100.) ; @@ -146,7 +146,7 @@ void AliPHOSQualAssDataMaker::InitRecPoints() } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::InitRaws() +void AliPHOSQADataMaker::InitRaws() { // create Raws histograms in Raws subdir const Int_t modMax = 5 ; @@ -185,7 +185,7 @@ void AliPHOSQualAssDataMaker::InitRaws() } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::InitSDigits() +void AliPHOSQADataMaker::InitSDigits() { // create SDigits histograms in SDigits subdir TH1F * h0 = new TH1F("hPhosSDigits", "SDigits energy distribution in PHOS", 100, 0., 100.) ; @@ -197,7 +197,7 @@ void AliPHOSQualAssDataMaker::InitSDigits() } //____________________________________________________________________________ -//void AliPHOSQualAssDataMaker::InitTrackSegments() +//void AliPHOSQADataMaker::InitTrackSegments() //{ // // create Track Segments histograms in TrackSegments subdir // fhTrackSegments = new TH1F("hPhosTrackSegments", "TrackSegments EMC-CPV distance in PHOS", 500, 0., 5000.) ; @@ -207,7 +207,7 @@ void AliPHOSQualAssDataMaker::InitSDigits() //} //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::MakeESDs(AliESDEvent * esd) +void AliPHOSQADataMaker::MakeESDs(AliESDEvent * esd) { // make QA data from ESDs @@ -222,7 +222,7 @@ void AliPHOSQualAssDataMaker::MakeESDs(AliESDEvent * esd) } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::MakeHits(TClonesArray * hits) +void AliPHOSQADataMaker::MakeHits(TClonesArray * hits) { //make QA data from Hits @@ -234,7 +234,7 @@ void AliPHOSQualAssDataMaker::MakeHits(TClonesArray * hits) } } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::MakeDigits(TClonesArray * digits) +void AliPHOSQADataMaker::MakeDigits(TClonesArray * digits) { // makes data from Digits @@ -247,7 +247,7 @@ void AliPHOSQualAssDataMaker::MakeDigits(TClonesArray * digits) } //____________________________________________________________________________ -// void AliPHOSQualAssDataMaker::MakeRecParticles(TTree * recpar) +// void AliPHOSQADataMaker::MakeRecParticles(TTree * recpar) // { // // makes data from RecParticles @@ -261,7 +261,7 @@ void AliPHOSQualAssDataMaker::MakeDigits(TClonesArray * digits) // } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::MakeRaws(AliRawReader* rawReader) +void AliPHOSQADataMaker::MakeRaws(AliRawReader* rawReader) { const Int_t modMax = 5 ; rawReader->Reset() ; @@ -294,7 +294,7 @@ void AliPHOSQualAssDataMaker::MakeRaws(AliRawReader* rawReader) } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::MakeRecPoints(TTree * clustersTree) +void AliPHOSQADataMaker::MakeRecPoints(TTree * clustersTree) { { // makes data from RecPoints @@ -338,7 +338,7 @@ void AliPHOSQualAssDataMaker::MakeRecPoints(TTree * clustersTree) } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::MakeSDigits(TClonesArray * sdigits) +void AliPHOSQADataMaker::MakeSDigits(TClonesArray * sdigits) { // makes data from SDigits @@ -351,7 +351,7 @@ void AliPHOSQualAssDataMaker::MakeSDigits(TClonesArray * sdigits) } //____________________________________________________________________________ -// void AliPHOSQualAssDataMaker::MakeTrackSegments(TTree * ts) +// void AliPHOSQADataMaker::MakeTrackSegments(TTree * ts) // { // // makes data from TrackSegments @@ -366,7 +366,7 @@ void AliPHOSQualAssDataMaker::MakeSDigits(TClonesArray * sdigits) // } //____________________________________________________________________________ -void AliPHOSQualAssDataMaker::StartOfDetectorCycle() +void AliPHOSQADataMaker::StartOfDetectorCycle() { //Detector specific actions at start of cycle diff --git a/PHOS/AliPHOSQualAssDataMaker.h b/PHOS/AliPHOSQADataMaker.h similarity index 67% rename from PHOS/AliPHOSQualAssDataMaker.h rename to PHOS/AliPHOSQADataMaker.h index 0a84589cf49..6292546f03e 100644 --- a/PHOS/AliPHOSQualAssDataMaker.h +++ b/PHOS/AliPHOSQADataMaker.h @@ -1,5 +1,5 @@ -#ifndef ALIPHOSQUALASSDATAMAKER_H -#define ALIPHOSQUALASSDATAMAKER_H +#ifndef ALIPHOSQADATAMAKER_H +#define ALIPHOSQADATAMAKER_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -21,18 +21,18 @@ class TList ; // --- Standard library --- // --- AliRoot header files --- -#include "AliQualAssDataMaker.h" +#include "AliQADataMaker.h" -class AliPHOSQualAssDataMaker: public AliQualAssDataMaker { +class AliPHOSQADataMaker: public AliQADataMaker { public: - AliPHOSQualAssDataMaker() ; // ctor - AliPHOSQualAssDataMaker(const AliPHOSQualAssDataMaker& qadm) ; - AliPHOSQualAssDataMaker& operator = (const AliPHOSQualAssDataMaker& qadm) ; - virtual ~AliPHOSQualAssDataMaker() {;} // dtor + AliPHOSQADataMaker() ; // ctor + AliPHOSQADataMaker(const AliPHOSQADataMaker& qadm) ; + AliPHOSQADataMaker& operator = (const AliPHOSQADataMaker& qadm) ; + virtual ~AliPHOSQADataMaker() {;} // dtor private: - virtual void EndOfDetectorCycle(AliQualAss::TASKINDEX, TList * list) ; + virtual void EndOfDetectorCycle(AliQA::TASKINDEX, TList * list) ; virtual void InitHits() ; virtual void InitESDs() ; virtual void InitDigits() ; @@ -51,8 +51,8 @@ private: //virtual void MakeTrackSegments(TTree *ts ) ; virtual void StartOfDetectorCycle() ; - ClassDef(AliPHOSQualAssDataMaker,1) // description + ClassDef(AliPHOSQADataMaker,1) // description }; -#endif // AliPHOSQualAssDataMaker_H +#endif // AliPHOSQADataMaker_H diff --git a/PHOS/AliPHOSQualAssChecker.h b/PHOS/AliPHOSQualAssChecker.h deleted file mode 100644 index 3a5e844b334..00000000000 --- a/PHOS/AliPHOSQualAssChecker.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef ALIPHOSQUALASSCHECKER_H -#define ALIPHOSQUALASSCHECKER_H -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice */ - - -/* $Id$ */ - -/* - Checks the quality assurance. - By comparing with reference data - Y. Schutz CERN July 2007 -*/ - - -// --- ROOT system --- -class TFile ; -class TH1F ; -class TH1I ; - -// --- Standard library --- - -// --- AliRoot header files --- -#include "AliQualAssCheckerBase.h" -class AliPHOSLoader ; - -class AliPHOSQualAssChecker: public AliQualAssCheckerBase { - -public: - AliPHOSQualAssChecker() : AliQualAssCheckerBase("PHOS","PHOS Quality Assurance Data Maker") {;} // ctor - AliPHOSQualAssChecker(const AliPHOSQualAssChecker& qac) : AliQualAssCheckerBase(qac.GetName(), qac.GetTitle()) {;} // cpy ctor - AliPHOSQualAssChecker& operator = (const AliPHOSQualAssChecker& qac) ; - virtual ~AliPHOSQualAssChecker() {;} // dtor - -private: - - ClassDef(AliPHOSQualAssChecker,1) // description - -}; - -#endif // AliPHOSQualAssChecker_H diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx index 1f874acd2c3..a2575c99d0e 100644 --- a/PHOS/AliPHOSSDigitizer.cxx +++ b/PHOS/AliPHOSSDigitizer.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.53 2007/09/30 17:08:20 schutz + * Introducing the notion of QA data acquisition cycle (needed by online) + * * Revision 1.52 2007/09/26 14:22:18 cvetan * Important changes to the reconstructor classes. Complete elimination of the run-loaders, which are now steered only from AliReconstruction. Removal of the corresponding Reconstruct() and FillESD() methods. * @@ -85,7 +88,7 @@ #include "AliPHOSGetter.h" #include "AliPHOSHit.h" #include "AliPHOSSDigitizer.h" -#include "AliPHOSQualAssDataMaker.h" +#include "AliPHOSQADataMaker.h" ClassImp(AliPHOSSDigitizer) @@ -129,10 +132,10 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const char * alirunFileName, //FIXME: get the run number Int_t run = 0 ; //EMXIF - GetQualAssDataMaker()->Init(AliQualAss::kHITS, run, fgkCycles) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kHITS) ; - GetQualAssDataMaker()->Init(AliQualAss::kSDIGITS, run) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kSDIGITS, "same") ; + GetQADataMaker()->Init(AliQA::kHITS, run, fgkCycles) ; + GetQADataMaker()->StartOfCycle(AliQA::kHITS) ; + GetQADataMaker()->Init(AliQA::kSDIGITS, run) ; + GetQADataMaker()->StartOfCycle(AliQA::kSDIGITS, "same") ; } //____________________________________________________________________________ @@ -153,10 +156,10 @@ AliPHOSSDigitizer::AliPHOSSDigitizer(const AliPHOSSDigitizer& sd) : //FIXME: get the run number Int_t run = 0 ; //EMXIF - GetQualAssDataMaker()->Init(AliQualAss::kHITS, run, fgkCycles) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kHITS) ; - GetQualAssDataMaker()->Init(AliQualAss::kSDIGITS, run) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kSDIGITS, "same") ; + GetQADataMaker()->Init(AliQA::kHITS, run, fgkCycles) ; + GetQADataMaker()->StartOfCycle(AliQA::kHITS) ; + GetQADataMaker()->Init(AliQA::kSDIGITS, run) ; + GetQADataMaker()->StartOfCycle(AliQA::kSDIGITS, "same") ; } //_____________________________________________________________________________ @@ -202,7 +205,7 @@ void AliPHOSSDigitizer::Init() gime->PostSDigitizer(this); gime->PhosLoader()->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); - fQADM = new AliPHOSQualAssDataMaker() ; + fQADM = new AliPHOSQADataMaker() ; } @@ -289,15 +292,15 @@ void AliPHOSSDigitizer::Exec(Option_t *option) // make Quality Assurance data - if (GetQualAssDataMaker()->IsCycleDone() ) { - GetQualAssDataMaker()->EndOfCycle(AliQualAss::kHITS) ; - GetQualAssDataMaker()->EndOfCycle(AliQualAss::kSDIGITS) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kHITS) ; - GetQualAssDataMaker()->StartOfCycle(AliQualAss::kSDIGITS, "same") ; + if (GetQADataMaker()->IsCycleDone() ) { + GetQADataMaker()->EndOfCycle(AliQA::kHITS) ; + GetQADataMaker()->EndOfCycle(AliQA::kSDIGITS) ; + GetQADataMaker()->StartOfCycle(AliQA::kHITS) ; + GetQADataMaker()->StartOfCycle(AliQA::kSDIGITS, "same") ; } - GetQualAssDataMaker()->Exec(AliQualAss::kHITS, hits) ; - GetQualAssDataMaker()->Exec(AliQualAss::kSDIGITS, sdigits) ; - GetQualAssDataMaker()->Increment() ; + GetQADataMaker()->Exec(AliQA::kHITS, hits) ; + GetQADataMaker()->Exec(AliQA::kSDIGITS, sdigits) ; + GetQADataMaker()->Increment() ; //Now write SDigits @@ -323,10 +326,10 @@ void AliPHOSSDigitizer::Exec(Option_t *option) }// event loop //Write the quality assurance data - GetQualAssDataMaker()->EndOfCycle(AliQualAss::kHITS) ; - GetQualAssDataMaker()->EndOfCycle(AliQualAss::kSDIGITS) ; - GetQualAssDataMaker()->Finish(AliQualAss::kHITS) ; - GetQualAssDataMaker()->Finish(AliQualAss::kSDIGITS) ; + GetQADataMaker()->EndOfCycle(AliQA::kHITS) ; + GetQADataMaker()->EndOfCycle(AliQA::kSDIGITS) ; + GetQADataMaker()->Finish(AliQA::kHITS) ; + GetQADataMaker()->Finish(AliQA::kSDIGITS) ; Unload(); diff --git a/PHOS/AliPHOSSDigitizer.h b/PHOS/AliPHOSSDigitizer.h index 59692c4ff53..03fe5358c63 100644 --- a/PHOS/AliPHOSSDigitizer.h +++ b/PHOS/AliPHOSSDigitizer.h @@ -9,6 +9,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.28 2007/09/30 17:08:20 schutz + * Introducing the notion of QA data acquisition cycle (needed by online) + * * Revision 1.27 2007/08/07 14:12:03 kharlov * Quality assurance added (Yves Schutz) * @@ -40,7 +43,7 @@ class TFile ; // --- Standard library --- // --- AliRoot header files --- -class AliPHOSQualAssDataMaker ; +class AliPHOSQADataMaker ; class AliPHOSSDigitizer: public TTask { @@ -64,7 +67,7 @@ public: private: - AliPHOSQualAssDataMaker * GetQualAssDataMaker() const { return fQADM ; } + AliPHOSQADataMaker * GetQADataMaker() const { return fQADM ; } void Init() ; void InitParameters() ; @@ -83,7 +86,7 @@ private: Int_t fFirstEvent; // first event to process Int_t fLastEvent; // last event to process - AliPHOSQualAssDataMaker * fQADM ; //!Quality Assurance Data Maker + AliPHOSQADataMaker * fQADM ; //!Quality Assurance Data Maker static const Int_t fgkCycles = 9999 ; // QA data accumulation cycle ClassDef(AliPHOSSDigitizer,4) // description diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx index de196b5d7eb..6b9fbd56fdc 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.92 2007/08/28 12:55:08 policheh + * Loaders removed from the reconstruction code (C.Cheshkov) + * * Revision 1.91 2007/08/07 14:12:03 kharlov * Quality assurance added (Yves Schutz) * @@ -118,7 +121,7 @@ #include "AliPHOSLink.h" #include "AliESDEvent.h" #include "AliESDtrack.h" -#include "AliPHOSQualAssDataMaker.h" +#include "AliPHOSQADataMaker.h" #include "AliPHOSEmcRecPoint.h" #include "AliPHOSCpvRecPoint.h" diff --git a/PHOS/AliPHOSTracker.cxx b/PHOS/AliPHOSTracker.cxx index a70ce1765a3..050e9b75c1b 100644 --- a/PHOS/AliPHOSTracker.cxx +++ b/PHOS/AliPHOSTracker.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.8 2007/08/28 12:55:08 policheh + * Loaders removed from the reconstruction code (C.Cheshkov) + * * Revision 1.7 2007/08/07 14:12:03 kharlov * Quality assurance added (Yves Schutz) * @@ -35,7 +38,7 @@ #include "AliPHOSTracker.h" #include "AliPHOSEmcRecPoint.h" #include "AliESDEvent.h" -#include "AliPHOSQualAssDataMaker.h" +#include "AliPHOSQADataMaker.h" #include "AliPHOSGetter.h" #include "AliESDtrack.h" #include "AliPHOSTrackSegmentMakerv1.h" diff --git a/PHOS/PHOSbaseLinkDef.h b/PHOS/PHOSbaseLinkDef.h index 2038a792dab..bf7ab0d6c0d 100644 --- a/PHOS/PHOSbaseLinkDef.h +++ b/PHOS/PHOSbaseLinkDef.h @@ -33,8 +33,8 @@ #pragma link C++ class AliPHOSSurvey+; #pragma link C++ class AliPHOSSurvey1+; -#pragma link C++ class AliPHOSQualAssDataMaker+; -#pragma link C++ class AliPHOSQualAssChecker+; +#pragma link C++ class AliPHOSQADataMaker+; +#pragma link C++ class AliPHOSQAChecker+; #pragma link C++ class AliPHOSRecParticle+; #pragma link C++ class AliPHOSRecPoint+; #pragma link C++ class AliPHOSCpvRecPoint+; diff --git a/PHOS/libPHOSbase.pkg b/PHOS/libPHOSbase.pkg index 4cd7e259d04..1f4204f79c6 100644 --- a/PHOS/libPHOSbase.pkg +++ b/PHOS/libPHOSbase.pkg @@ -19,8 +19,8 @@ SRCS = AliPHOS.cxx \ AliPHOSEmcBadChannelsMap.cxx \ AliPHOSSurvey.cxx \ AliPHOSSurvey1.cxx \ - AliPHOSQualAssDataMaker.cxx \ - AliPHOSQualAssChecker.cxx \ + AliPHOSQADataMaker.cxx \ + AliPHOSQAChecker.cxx \ AliPHOSRecParticle.cxx AliPHOSRecPoint.cxx \ AliPHOSEmcRecPoint.cxx \ AliPHOSCpvRecPoint.cxx AliPHOSTrackSegment.cxx -- 2.43.0