Fix for backward compatibility of TOF structures (needed for tenders)

[u/mrichter/AliRoot.git] / ZDC / AliZDCQADataMakerRec.cxx

diff --git a/ZDC/AliZDCQADataMakerRec.cxx b/ZDC/AliZDCQADataMakerRec.cxx
index aaa7766f77403138d38593781db93c5ccce46797..0c696432103be853e09d12b1f322ab3907f9052f 100644 (file)
--- a/ZDC/AliZDCQADataMakerRec.cxx
+++ b/ZDC/AliZDCQADataMakerRec.cxx
@@ -604,7 +604,7 @@ void AliZDCQADataMakerRec::MakeRaws(AliRawReader *rawReader)
         else if(stream.GetChannel()==3 && tdcValue!=0.){
            zpcTDC = tdcValue;
         }
-        else if(stream.GetChannel()==4 && tdcValue!=0.){
+        else if(stream.GetChannel()==5 && tdcValue!=0.){
            znaTDC = tdcValue;
         }
         else if(stream.GetChannel()==7 && tdcValue!=0.){
@@ -629,32 +629,32 @@ void AliZDCQADataMakerRec::MakeRaws(AliRawReader *rawReader)
              if(zncTDC!=0.){
                Float_t znc = zncTDC-tdcGate;
                FillRawsData(14,znc);
-               FillRawsData(21,1, znc);
+               if(znc>-340. && znc<-290.) FillRawsData(21,1, znc);
              }
              if(zpcTDC!=0.){
                Float_t zpc = zpcTDC-tdcGate;
                FillRawsData(15,zpc);
-               FillRawsData(21,2, zpc);
+               if(zpc>-340. && zpc<-290.) FillRawsData(21,2, zpc);
              }
              if(znaTDC!=0.){
                Float_t zna = znaTDC-tdcGate;
                FillRawsData(16,zna);
-               FillRawsData(21,3, zna);
+               if(zna>-340. && zna<-290.) FillRawsData(21,3, zna);
              }
              if(zpaTDC!=0.){
                Float_t zpa = zpaTDC-tdcGate;
                FillRawsData(17,zpa);
-               FillRawsData(21,4, zpa);
+               if(zpa>-340. && zpa<-290.) FillRawsData(21,4, zpa);
              }
              if(zem1TDC!=0.){
                Float_t zem1 = zem1TDC-tdcGate;
                FillRawsData(18,zem1);
-               FillRawsData(21,5, zem1);
+               if(zem1>-340. && zem1<-290.) FillRawsData(21,5, zem1);
              }
              if(zem2TDC!=0.){
                Float_t zem2 = zem2TDC-tdcGate;
                FillRawsData(19,zem2);
-               FillRawsData(21,6, zem2);
+               if(zem2TDC>-340. && zem2<-290.) FillRawsData(21,6, zem2);
               }
              if(znaSumTDC!=0. && zncSumTDC!=0.){
                 Float_t tdcC = zncSumTDC-l0;
@@ -848,12 +848,15 @@ void AliZDCQADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArr
                         AliRecoParam::GetEventSpecieName(specie), AliQADataMaker::GetTrigClassName(itc)));
        }
        else{
+         if(h22){
 
-         for(Int_t ibin=1; ibin<=h20->GetNbinsX(); ibin++){
-           h22->SetBinContent(ibin, h20->GetBinContent(ibin)); 
-           h22->SetBinError(ibin, h20->GetBinError(ibin));
+           for(Int_t ibin=1; ibin<=h20->GetNbinsX(); ibin++){
+             h22->SetBinContent(ibin, h20->GetBinContent(ibin)); 
+             h22->SetBinError(ibin, h20->GetBinError(ibin));
+           }
+           h22->SetLineColor(kBlue+1); h22->SetLineWidth(2);
          }
-         h22->SetLineColor(kBlue+1); h22->SetLineWidth(2);
+         else printf("Warning: Raw ADC QA histo not found \n\n");
        }
        if(!h14 || !h15 || !h16 || !h17 || !h18 || !h19){
        AliWarning("AliZDCQADataMakerRec -> RAW TDC histos not found!"); 
@@ -866,20 +869,23 @@ void AliZDCQADataMakerRec::EndOfDetectorCycle(AliQAv1::TASKINDEX_t task, TObjArr
            h23->SetBinContent(ibin, h21->GetBinContent(ibin)); 
            h23->SetBinError(ibin, h21->GetBinError(ibin));
          }*/
-         h23->SetBinContent(1, h14->GetMean());
-         h23->SetBinError(1, h14->GetRMS());
-         h23->SetBinContent(2, h15->GetMean());
-         h23->SetBinError(2, h15->GetRMS());
-         h23->SetBinContent(3, h16->GetMean());
-         h23->SetBinError(3, h16->GetRMS());
-         h23->SetBinContent(4, h17->GetMean());
-         h23->SetBinError(4, h17->GetRMS());
-         h23->SetBinContent(5, h18->GetMean());
-         h23->SetBinError(5, h18->GetRMS());
-         h23->SetBinContent(6, h19->GetMean());
-         h23->SetBinError(6, h19->GetRMS());
-         //
-         h23->SetLineColor(kAzure+6); h22->SetLineWidth(2);
+         if(h23){
+           h23->SetBinContent(1, h14->GetMean());
+           h23->SetBinError(1, h14->GetRMS());
+           h23->SetBinContent(2, h15->GetMean());
+           h23->SetBinError(2, h15->GetRMS());
+           h23->SetBinContent(3, h16->GetMean());
+           h23->SetBinError(3, h16->GetRMS());
+           h23->SetBinContent(4, h17->GetMean());
+           h23->SetBinError(4, h17->GetRMS());
+           h23->SetBinContent(5, h18->GetMean());
+           h23->SetBinError(5, h18->GetRMS());
+           h23->SetBinContent(6, h19->GetMean());
+           h23->SetBinError(6, h19->GetRMS());
+           //
+           h23->SetLineColor(kAzure+6); h22->SetLineWidth(2);
+         }
+         else printf(" Warning: Raw TDC QA histo not found\n\n");
         }
        if(!h25 || !h26){
         AliWarning("AliZDCQADataMakerRec -> RAW centroid histos not found!");