Fix for #87900: Request to port changes is AliTOFQADataMakerRec code into release...
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 18 Oct 2011 12:58:58 +0000 (12:58 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 18 Oct 2011 12:58:58 +0000 (12:58 +0000)
TOF/AliTOFQADataMakerRec.cxx
TOF/AliTOFQADataMakerRec.h

index 33cc6e5..81d9bee 100644 (file)
@@ -666,7 +666,7 @@ void AliTOFQADataMakerRec::MakeRaws(AliRawReader* rawReader)
                  halfSMphi=indexCTTM[0]*10.+5.;
                else  halfSMphi=(indexCTTM[0]-36)*10.+5.;
                macropadPhiTimeUPC[iFiredMacropad][0]=halfSMphi;
-               indexBC=(Int_t) tofRawDatum->GetTOF()*tdc2ns/25;
+               indexBC= TMath::Nint(tofRawDatum->GetTOF()*tdc2ns)/25;
                macropadPhiTimeUPC[iFiredMacropad][1]=indexBC;
              }
            }
@@ -1372,7 +1372,7 @@ void AliTOFQADataMakerRec::ReadHistogramRangeFromFile(const Char_t * filename)
   Float_t minTime=9999.0, maxTime=-9999.0;
   Int_t cutFiredMacropad=0;
 
-  fscanf(configFile,"%i %i %i %f %f", &cutFiredMacropad,&minMulti,&maxMulti,&minTime,&maxTime);
+  fscanf(configFile,"%10i %10i %10i %10f %10f", &cutFiredMacropad,&minMulti,&maxMulti,&minTime,&maxTime);
   
   //set multiplicity histo ranges
   if (minMulti>maxMulti){
@@ -1391,7 +1391,7 @@ void AliTOFQADataMakerRec::ReadHistogramRangeFromFile(const Char_t * filename)
     AliInfo("Invalid range for time histogram set. Changing to defualt values.");
     SetDefaultTimeHistogramRange();
   } else {
-    nbinsTime = ceil((maxTime - minTime)/fgkNbinsWidthTime);//ns
+    nbinsTime = TMath::Nint((maxTime - minTime)/fgkNbinsWidthTime);//ns
     maxTime=minTime+nbinsTime*fgkNbinsWidthTime;//ns
     SetNbinsTimeHisto(nbinsTime);
     SetTimeHistoRange(minTime,maxTime);
index 2f6f222..f08813d 100644 (file)
@@ -65,7 +65,7 @@ private:
   static void SetNbinsMultiplicityHisto(Int_t value){fgNbinsMultiplicity=value; return;}; 
   static void SetMultiplicityHistoRange (Int_t valueMin, Int_t valueMax){fgRangeMinMultiplicity=valueMin; fgRangeMaxMultiplicity=valueMax; return;}
   static void SetNbinsTimeHisto(Int_t value){fgNbinsTime=value; return;};
-  static void SetTimeHistoRange (Int_t valueMin, Int_t valueMax){fgRangeMinTime=valueMin; fgRangeMaxTime=valueMax; return;};
+  static void SetTimeHistoRange (Float_t valueMin, Float_t valueMax){fgRangeMinTime=valueMin; fgRangeMaxTime=valueMax; return;};
   static void SetCutNmaxFiredMacropad(Int_t value){fgCutNmaxFiredMacropad=value;return;};
 
          // void   ResetAllTRMcounters();