Remove of outputs from ACORDEQAChecker log (Yves remark) and setting an empty object...

diff --git a/ACORDE/AliACORDEQAChecker.cxx b/ACORDE/AliACORDEQAChecker.cxx
index bcf5f5d2783596273bde993aaae52a4ab90418e2..03bcb51efc1f29d03ad1fd35aabb3d1a9388a47b 100755 (executable)
--- a/ACORDE/AliACORDEQAChecker.cxx
+++ b/ACORDE/AliACORDEQAChecker.cxx
@@ -102,14 +102,14 @@ Double_t * AliACORDEQAChecker::Check(AliQA::ALITASK_t /*index*/, TObjArray ** li
                acoHitsNorm =  hdata->GetBinContent(i)/hdata->GetMaximum();
                if  (acoQARefDir)
                {
-                       AliWarning("Using the QA Reference data for ACORDE !!!");
+       //              AliWarning("Using the QA Reference data for ACORDE !!!");
                        test[specie] = CheckAcordeRefHits(list[specie],(TObjArray *)acoQARefDir->GetObject());
                        if ((test[specie] = 0.86) || (acoHitsNorm>0.50)) 
                        {
-                               acoRefTest[specie]=0.78;printf("testMario: %f\n",acoRefTest[specie]);
+                               acoRefTest[specie]=0.78;//printf("testMario: %f\n",acoRefTest[specie]);printf("histo:%f\n",hdata->GetMaximum());
                        }
                }else{
-               AliWarning("Using the inner ACORDE QA Checker !!!");
+       //      AliWarning("Using the inner ACORDE QA Checker !!!");
                if ( (acoHitsNorm>0.40) && (acoHitsNorm<=1) ) acoTest[specie] = 0.75;
                if ( (acoHitsNorm>0.0020) && (acoHitsNorm<=0.40) ) acoTest[specie] = 0.251;
                if ( (acoHitsNorm>0.0) && (acoHitsNorm<=0.0020) ) acoTest[specie] = 0.0010;
@@ -123,17 +123,18 @@ Double_t * AliACORDEQAChecker::Check(AliQA::ALITASK_t /*index*/, TObjArray ** li
       }
       if (count[specie] != 0) { 
         if (test[specie]==0) {
-          AliWarning("Histograms are there, but they are all empty: setting flag to kWARNING");
+         // AliWarning("Histograms are there, but they are all empty: setting flag to kWARNING");
           test[specie] = 0.5;  //upper limit value to set kWARNING flag for a task
         }
         else {
        if (acoQARefDir) test[specie] = acoRefTest[specie];
        else{
-       test[specie] = acoTest[specie];printf("testDyMa: %f\n",test[specie]);}
+       test[specie] = acoTest[specie];//printf("testDyMa: %f\n",test[specie]);
+       }
         }
       }
     }
-    AliInfo(Form("Test Result = %f", test[specie])) ; 
+   // AliInfo(Form("Test Result = %f", test[specie])) ; 
   }
   return test ; 
 }
@@ -141,11 +142,15 @@ Double_t AliACORDEQAChecker::CheckAcordeRefHits(TObjArray *AcordeList, TObjArray
 {
        Double_t acoTest = 0;
        TIter next(AcordeList);
-       TH1 * histo;
-       
-       while ( (histo = dynamic_cast<TH1 *>(next())) )
+       TH1 *histo;
+       for (Int_t i=0;i<60;i++)
        {
-               if( histo->KolmogorovTest((TH1F *)AcordeRef->At(0))<0.8)  acoTest = 0.86;
+               while ( (histo = dynamic_cast<TH1 *>(next())) )
+               {       
+                       if ( (histo->GetBinContent(i)/histo->GetMaximum())<1.0 ) acoTest = 0.86;
+//             if( histo->KolmogorovTest((TH1F *)AcordeRef->At(0))<0.8)  acoTest = 0.86;
+                       //printf("href:%f\n",histo->GetMaximum());
+               }
        }       
        return acoTest;
 }

diff --git a/ACORDE/AliACORDEQAChecker.h b/ACORDE/AliACORDEQAChecker.h
index 5452595c96e1982c9eb73658e72982194f5008a0..c2607f5e628e5097108acf937fc0692caf90f956 100755 (executable)
--- a/ACORDE/AliACORDEQAChecker.h
+++ b/ACORDE/AliACORDEQAChecker.h
@@ -27,7 +27,7 @@ class AliACORDEQAChecker: public AliQACheckerBase {
 
 public:
   AliACORDEQAChecker() : AliQACheckerBase("ACORDE","ACORDE Quality Assurance Data Checker") {;}          // constructor
-  AliACORDEQAChecker(const AliACORDEQAChecker& qac) : AliQACheckerBase(qac.GetName(), qac.GetTitle()) {;} // constructor   
+//  AliACORDEQAChecker(const AliACORDEQAChecker& qac) : AliQACheckerBase(qac.GetName(), qac.GetTitle()) {;} // constructor   
   virtual ~AliACORDEQAChecker() {;} // destructor
 
   virtual Double_t * Check(AliQA::ALITASK_t index) ;

diff --git a/ACORDE/AliACORDERecoParam.cxx b/ACORDE/AliACORDERecoParam.cxx
index eddce71a7d1b7317067fc780bd19e2ff9dd912e3..1f6e00d4027f273303f8ff015bef00c0936ec078 100644 (file)
--- a/ACORDE/AliACORDERecoParam.cxx
+++ b/ACORDE/AliACORDERecoParam.cxx
@@ -47,29 +47,30 @@ ClassImp(AliACORDERecoParam)
 
 //_____________________________________________________________________________
 AliACORDERecoParam::AliACORDERecoParam():
-  AliDetectorRecoParam(),
-  fAcordeSingleMuonTrigger(kFALSE),
-  fAcordeMultiMuonTrigger(kFALSE),
-  fAcordeWord0(0x00000000),
-  fAcordeWord1(0x00000000),
-  fAcordeWord2(0x00000000),
-  fAcordeWord3(0x00000000)       
+  AliDetectorRecoParam()
+//  fAcordeSingleMuonTrigger(kFALSE),
+//  fAcordeMultiMuonTrigger(kFALSE),
+//  fAcordeWord0(0x00000000),
+//  fAcordeWord1(0x00000000),
+//  fAcordeWord2(0x00000000),
+//  fAcordeWord3(0x00000000)       
 {
        // ACORDE's RecoParam constructor
  
         SetNameTitle("ACORDE","ACORDE");
+        AliInfo(Form("Empty object for ACORDE RecoParam"));
 }
 
 
 //____________________________________________________________________________
 AliACORDERecoParam::AliACORDERecoParam(const AliACORDERecoParam &p):
-  AliDetectorRecoParam(p),
-  fAcordeSingleMuonTrigger(p.fAcordeSingleMuonTrigger),
-  fAcordeMultiMuonTrigger(p.fAcordeMultiMuonTrigger),
-  fAcordeWord0(p.fAcordeWord0),
-  fAcordeWord1(p.fAcordeWord1),
-  fAcordeWord2(p.fAcordeWord2),
-  fAcordeWord3(p.fAcordeWord3)
+  AliDetectorRecoParam(p)
+//  fAcordeSingleMuonTrigger(p.fAcordeSingleMuonTrigger),
+//  fAcordeMultiMuonTrigger(p.fAcordeMultiMuonTrigger),
+//  fAcordeWord0(p.fAcordeWord0),
+//  fAcordeWord1(p.fAcordeWord1),
+//  fAcordeWord2(p.fAcordeWord2),
+//  fAcordeWord3(p.fAcordeWord3)
 {
        // Copy of constructor
 }
@@ -83,13 +84,13 @@ AliACORDERecoParam& AliACORDERecoParam::operator=(const AliACORDERecoParam &p)
        return *this;
   
        AliDetectorRecoParam::operator=(p);
-       fAcordeSingleMuonTrigger=p.fAcordeSingleMuonTrigger;
+/*     fAcordeSingleMuonTrigger=p.fAcordeSingleMuonTrigger;
        fAcordeMultiMuonTrigger=p.fAcordeMultiMuonTrigger;      
        fAcordeWord0=p.fAcordeWord0;
        fAcordeWord1=p.fAcordeWord1;
        fAcordeWord2=p.fAcordeWord2;
        fAcordeWord3=p.fAcordeWord3;
-       
+  */   
        return *this;
 }
 //_____________________________________________________________________________
@@ -99,6 +100,7 @@ AliACORDERecoParam::~AliACORDERecoParam()
 }
 
 //_____________________________________________________________________________
+/*
 AliACORDERecoParam *AliACORDERecoParam::GetPbPbparam()
 {
  
@@ -161,21 +163,26 @@ AliACORDERecoParam *AliACORDERecoParam::GetCosmicMuonParam()
         acordeRecoParam->fAcordeWord3 = 0xFFFFFFFF; // [31..60] ACORDE's modules in ACORDE_MULTI
         return acordeRecoParam;
 }
-
+*/
 //_____________________________________________________________________________
 void AliACORDERecoParam::PrintParameters() const
 {
        // Printing of the used ACORDE reconstruction parameters
 
-       AliInfo(Form("ACORDE's Single Muon Trigger Mode: %b", fAcordeSingleMuonTrigger));
-       AliInfo(Form("ACORDE's Multi Muon Trigger Mode: %b", fAcordeMultiMuonTrigger));
-       if(fAcordeSingleMuonTrigger==kTRUE)
-       {
-               AliInfo(Form("ACORDE's Trigger Mask: 0x%08x 0x%08x",fAcordeWord0,fAcordeWord1));
-       }
-       if(fAcordeMultiMuonTrigger==kTRUE)
-       {
-                AliInfo(Form("ACORDE's Trigger Mask: 0x%08x 0x%08x",fAcordeWord2,fAcordeWord3));
-
-       }
+ //    AliInfo(Form("ACORDE's Single Muon Trigger Mode: %b", fAcordeSingleMuonTrigger));
+//     AliInfo(Form("ACORDE's Multi Muon Trigger Mode: %b", fAcordeMultiMuonTrigger));
+//     if(fAcordeSingleMuonTrigger==kTRUE)
+//     {
+//             AliInfo(Form("ACORDE's Trigger Mask: 0x%08x 0x%08x",fAcordeWord0,fAcordeWord1));
+//     }
+//     if(fAcordeMultiMuonTrigger==kTRUE)
+//     {
+  //              AliInfo(Form("ACORDE's Trigger Mask: 0x%08x 0x%08x",fAcordeWord2,fAcordeWord3));
+
+//     }
+
+
+       AliInfo(Form("Empty object for ACORDE RecoParam"));
+
+
 }

diff --git a/ACORDE/AliACORDERecoParam.h b/ACORDE/AliACORDERecoParam.h
index 25b0001b4463072c1c43af9f9f5afc06dd2aec0b..b1d3f76db5d33394ae7c178d07959b16d06fb6d4 100644 (file)
--- a/ACORDE/AliACORDERecoParam.h
+++ b/ACORDE/AliACORDERecoParam.h
@@ -56,7 +56,7 @@ class AliACORDERecoParam : public AliDetectorRecoParam
   virtual void PrintParameters() const;
 
   //Getters
- 
+/* 
   Bool_t   GetAcordeSingleMuonTrigger()    const  {return fAcordeSingleMuonTrigger;}
   Bool_t   GetAcordeMultiMuonTrigger()     const  {return fAcordeMultiMuonTrigger;}
   UInt_t   GetAcordeWord0()    const  {return fAcordeWord0;}
@@ -79,7 +79,8 @@ class AliACORDERecoParam : public AliDetectorRecoParam
   static   AliACORDERecoParam *GetPbPbparam();       // reco param for PbPb.
   static   AliACORDERecoParam *GetPPparam();         // reco param for PP
   static   AliACORDERecoParam *GetCosmicMuonParam(); // reco param for cosmic muons
- private:
+ 
+private:
 
   Bool_t fAcordeSingleMuonTrigger; // kTRUE if ACORDE triggered in Singe Muon Mode
   Bool_t fAcordeMultiMuonTrigger; // kTRUE if ACORDE triggered in Multi Muon Mode
@@ -87,7 +88,7 @@ class AliACORDERecoParam : public AliDetectorRecoParam
   UInt_t fAcordeWord1; // [31..60] Acorde's Modules in Single Muon Trigger
   UInt_t fAcordeWord2; // [1..30] Acorde's Modules in Multi Muon Trigger
   UInt_t fAcordeWord3; // [31..60] Acorde's Modules in Multi Muon Trigger
-
-  ClassDef(AliACORDERecoParam, 3)
+*/
+  ClassDef(AliACORDERecoParam, 4)
 };
 #endif

diff --git a/ACORDE/macros/MakeACORDEQAReferenceCalibData.C b/ACORDE/macros/MakeACORDEQAReferenceCalibData.C
index 315b12aa0be57cb6bd989d5c88025a25b1b78d39..b18041cdedf827ee2337dec60fe9d48146403390 100644 (file)
--- a/ACORDE/macros/MakeACORDEQAReferenceCalibData.C
+++ b/ACORDE/macros/MakeACORDEQAReferenceCalibData.C
@@ -36,7 +36,6 @@ void MakeACORDEQAReferenceCalibData()
 
 
        AliACORDECalibData *calibda = new AliACORDECalibData("QACalib");
-
        Float_t ModulesActivity[60] = 
        {
                0.92,0.51,0.68,0.76,0.78,0.83,0.00,0.69,0.72,0.86,