Reverting wrong commit

diff --git a/FASTSIM/AliQuenchingWeights.cxx b/FASTSIM/AliQuenchingWeights.cxx
index 1157ec2d1430e512aedba6822e3cde5de5b6b693..bbb2820d65f28769ed20cd9ef1577b8f95a278bd 100644 (file)
--- a/FASTSIM/AliQuenchingWeights.cxx
+++ b/FASTSIM/AliQuenchingWeights.cxx
@@ -40,7 +40,6 @@
 #include <TGraph.h>
 #include <TROOT.h>
 #include <TSystem.h>
-#include <TString.h>
 #include <TLegend.h>
 #include "AliQuenchingWeights.h"
 
@@ -75,7 +74,9 @@ AliQuenchingWeights::AliQuenchingWeights()
       fTablesLoaded(kFALSE)
 {
   //default constructor 
-  fHisto = new TH1F(Form("hhistoqw_%d",fInstanceNumber),"",fgkBins,0.,fgkMaxBin);
+  Char_t name[100];
+  sprintf(name,"hhistoqw_%d",fInstanceNumber);
+  fHisto = new TH1F(name,"",fgkBins,0.,fgkMaxBin);
   for(Int_t bin=1;bin<=fgkBins;bin++) 
     fHisto->SetBinContent(bin,0.);
 }
@@ -106,7 +107,9 @@ AliQuenchingWeights::AliQuenchingWeights(const AliQuenchingWeights& a)
   fECMethod=(kECMethod)a.GetECMethod();
   fLengthMax=a.GetLengthMax();
   fInstanceNumber=fgCounter++;
-  fHisto = new TH1F(Form("hhistoqw_%d",fInstanceNumber),"",fgkBins,0.,fgkMaxBin);
+  Char_t name[100];
+  sprintf(name,"hhistoqw_%d",fInstanceNumber);
+  fHisto = new TH1F(name,"",fgkBins,0.,fgkMaxBin);
   for(Int_t bin=1;bin<=fgkBins;bin++) 
       fHisto->SetBinContent(bin,0.);
 
@@ -154,8 +157,10 @@ Int_t AliQuenchingWeights::InitMult(const Char_t *contall,const Char_t *discall)
   fTablesLoaded = kFALSE;
   fMultSoft=kTRUE;
   
+  Char_t fname[1024];
+  sprintf(fname,"%s",gSystem->ExpandPathName(contall));
   //PH  ifstream fincont(fname);
-  fstream fincont(Form("%s",gSystem->ExpandPathName(contall)),ios::in);
+  fstream fincont(fname,ios::in);
 #if defined(__HP_aCC) || defined(__DECCXX)
   if(!fincont.rdbuf()->is_open()) return -1;
 #else
@@ -189,8 +194,9 @@ Int_t AliQuenchingWeights::InitMult(const Char_t *contall,const Char_t *discall)
   }
   fincont.close();
 
+  sprintf(fname,"%s",gSystem->ExpandPathName(discall));
   //PH  ifstream findisc(fname); 
-  fstream findisc(Form("%s",gSystem->ExpandPathName(discall)),ios::in); 
+  fstream findisc(fname,ios::in); 
 #if defined(__HP_aCC) || defined(__DECCXX)
   if(!findisc.rdbuf()->is_open()) return -1;
 #else
@@ -497,8 +503,10 @@ Int_t AliQuenchingWeights::InitSingleHard(const Char_t *contall,const Char_t *di
   fTablesLoaded = kFALSE;
   fMultSoft=kFALSE;
   
+  Char_t fname[1024];
+  sprintf(fname,"%s",gSystem->ExpandPathName(contall));
   //PH  ifstream fincont(fname);
-  fstream fincont(Form("%s",gSystem->ExpandPathName(contall)),ios::in);
+  fstream fincont(fname,ios::in);
 #if defined(__HP_aCC) || defined(__DECCXX)
   if(!fincont.rdbuf()->is_open()) return -1;
 #else
@@ -539,8 +547,9 @@ Int_t AliQuenchingWeights::InitSingleHard(const Char_t *contall,const Char_t *di
   }
   fincont.close();
 
+  sprintf(fname,"%s",gSystem->ExpandPathName(discall));
   //PH  ifstream findisc(fname); 
-  fstream findisc(Form("%s",gSystem->ExpandPathName(discall)),ios::in); 
+  fstream findisc(fname,ios::in); 
 #if defined(__HP_aCC) || defined(__DECCXX)
   if(!findisc.rdbuf()->is_open()) return -1;
 #else

diff --git a/ITS/AliITSQASPDChecker.cxx b/ITS/AliITSQASPDChecker.cxx
index 82c7cf729a80c4763f9bc248caebb6924fc76d01..72b0e1477c62832248cf5407969deb30b3f6b5dd 100644 (file)
--- a/ITS/AliITSQASPDChecker.cxx
+++ b/ITS/AliITSQASPDChecker.cxx
@@ -42,6 +42,11 @@ AliITSQASPDChecker::AliITSQASPDChecker() :
  fHighSPDValue(NULL),
  fImage(NULL) 
  {
+ for(Int_t i=0; i<6 ; i++) { 
+  fDisplayStatus[i] = new TPaveText(0.2,0.23,0.7,0.5,"NDC");
+  fDisplayStatus[i]->SetFillColor(kGreen);
+  fDisplayStatus[i]->AddText("OK");
+  } 
  }
 //__________________________________________________________________
 AliITSQASPDChecker& AliITSQASPDChecker::operator = (const AliITSQASPDChecker& qac ) 
@@ -57,6 +62,9 @@ if(fStepBitSPD) delete[] fStepBitSPD ;
 if(fLowSPDValue)delete[]fLowSPDValue;
 if(fHighSPDValue) delete[]fHighSPDValue;
 if(fImage) delete[]fImage;
+for(Int_t i=0; i<6; i++){
+delete fDisplayStatus[i];
+}
 } 
 
 //__________________________________________________________________
@@ -176,69 +184,81 @@ while ( (hdata = dynamic_cast<TH1 *>(next())) ) {
         if(!histName.Contains("SPD")) continue;
         totalHistos++;
         // data format error
-       if(histName.Contains("SPDErrorsAll")){
-       if(hdata->GetListOfFunctions()->GetEntries()<1) hdata->GetListOfFunctions()->Add(new TPaveText(0.2,0.23,0.7,0.5,"NDC"));
-
+        if(histName.Contains("SPDErrorsAll")){
+       if(hdata->GetListOfFunctions()->GetEntries()<1) hdata->GetListOfFunctions()->Add(fDisplayStatus[0]);
+        if(hdata->Integral(0,hdata->GetNbinsX())>0){
           for(Int_t i=0; i<hdata->GetListOfFunctions()->GetEntries(); i++){
           TString funcName = hdata->GetListOfFunctions()->At(i)->ClassName();
           if(funcName.Contains("TPaveText")){
-           TPaveText *p = (TPaveText*)hdata->GetListOfFunctions()->At(i);
-             p->Clear();
-
-            if(hdata->Integral(0,hdata->GetNbinsX())>0){
+            TPaveText *p = (TPaveText*)hdata->GetListOfFunctions()->At(i);
             Bool_t isHighMult = kFALSE;
             for(Int_t ieq=0; ieq<20; ieq++){
              if(hdata->GetBinContent(ieq+1,17+1)>0 && hdata->GetBinContent(ieq+1,20+1)>0) isHighMult = kTRUE;
             }
             if(isHighMult) {
+              p->Clear();
              p->SetFillColor(kOrange);
              p->AddText("High occupancy in a chip detected (-> errors type 17,20 and 0 are present). ");
              p->AddText("ONLY IF OTHER error types are present CALL the expert");
-             } else {
+             }
+            else {
+             p->Clear();
             p->SetFillColor(kRed);
             p->AddText("Data Format NOT OK. Please call the expert!");
             }
-            response = fHighSPDValue[AliQAv1::kFATAL];
-            fatalProblem=kTRUE;
-            continue;
-           } // if errors 
-           else {
-             p->Clear();
-             p->SetFillColor(kGreen);
-             p->AddText("OK");
-            }
-          } // TPaveText
-         } // list entries   
-        } // data format error
-
+            
+           }
+          }
+           response = fHighSPDValue[AliQAv1::kFATAL];
+          fatalProblem=kTRUE;
+           break;
+         } else {  
+         for(Int_t i=0; i<hdata->GetListOfFunctions()->GetEntries(); i++){
+          TString funcName = hdata->GetListOfFunctions()->At(i)->ClassName();
+          if(funcName.Contains("TPaveText")){
+            TPaveText *p = (TPaveText*)hdata->GetListOfFunctions()->At(i);
+            p->Clear();
+            p->SetFillColor(kGreen);
+            p->AddText("OK");
+          
+          }
+          }
+        }
+        }
         // MEB error
         else if(histName.Contains("MEB")){
-         if(hdata->GetListOfFunctions()->GetEntries()<1) hdata->GetListOfFunctions()->Add(new TPaveText(0.2,0.23,0.7,0.5,"NDC"));
-
-          for(Int_t i=0; i<hdata->GetListOfFunctions()->GetEntries(); i++){
+       if(hdata->GetListOfFunctions()->GetEntries()<1) hdata->GetListOfFunctions()->Add(fDisplayStatus[1]);
+          if(hdata->GetEntries()>0){
+             for(Int_t i=0; i<hdata->GetListOfFunctions()->GetEntries(); i++){
           TString funcName = hdata->GetListOfFunctions()->At(i)->ClassName();
           if(funcName.Contains("TPaveText")){
             TPaveText *p = (TPaveText*)hdata->GetListOfFunctions()->At(i);
             p->Clear();
-
-          if(hdata->GetEntries()>0){
             p->SetFillColor(kRed);
             p->AddText("MEB problem could be present. Please check if SPD is in READY state.");
             p->AddText("If SPD is in -READY- state, please notify it to the expert."); 
-            response = fHighSPDValue[AliQAv1::kFATAL];
-            fatalProblem=kTRUE;
-            continue;
-
-           } else {
+           }
+          } 
+         
+         
+           response = fHighSPDValue[AliQAv1::kFATAL];
+          fatalProblem=kTRUE;
+           break;
+          } else {  
+         for(Int_t i=0; i<hdata->GetListOfFunctions()->GetEntries(); i++){
+          TString funcName = hdata->GetListOfFunctions()->At(i)->ClassName();
+          if(funcName.Contains("TPaveText")){
+            TPaveText *p = (TPaveText*)hdata->GetListOfFunctions()->At(i);
+            p->Clear();
             p->SetFillColor(kGreen);
             p->AddText("OK");
-              }   
-
-           } // pave text
-          } // list 
-         }
-       goodHistos++;
+          
+          }
+          }
+        }      
         }
+       goodHistos++;
+      }
      }
     if(!fatalProblem) response = goodHistos/totalHistos;
    // printf("n histos %f - good ones %f ----> ratio %f , fatal response %i\n",totalHistos,goodHistos,goodHistos/totalHistos,(Int_t)fatalProblem);

diff --git a/ITS/AliITSQASPDChecker.h b/ITS/AliITSQASPDChecker.h
index b3341beb1c6f7b312a5f36bb154bf882c0ae3aa9..e8a39a215f88d0a0e243654127639550f5518eee 100644 (file)
--- a/ITS/AliITSQASPDChecker.h
+++ b/ITS/AliITSQASPDChecker.h
@@ -48,6 +48,8 @@ private:
   Float_t *fHighSPDValue;        // lower limits for QA bit settings
   TCanvas **    fImage;          //[AliRecoParam::kNSpecies]
 
+  TPaveText * fDisplayStatus[6]; //Online Comments for the DQM-shifter histos 
+
   ClassDef(AliITSQASPDChecker,4)  // description 
 
 };