- ATO-57, ATO-71 Fixed TPC multiplicity estimator (nTotTracks -> nTotESDTracks);...

[u/mrichter/AliRoot.git] / VZERO / AliVZEROPreprocessor.cxx

diff --git a/VZERO/AliVZEROPreprocessor.cxx b/VZERO/AliVZEROPreprocessor.cxx
index 8535b8210edad601a7aa36c64a0a4cdfccbce8e4..9177210ca9d2caef0c3636b30a981943f8b4c946 100644 (file)
--- a/VZERO/AliVZEROPreprocessor.cxx
+++ b/VZERO/AliVZEROPreprocessor.cxx
@@ -73,8 +73,10 @@ void AliVZEROPreprocessor::Initialize(Int_t run, UInt_t startTime,
    fEndTime   = GetEndTimeDCSQuery ();
    time_t daqStart = (time_t) (((TString)GetRunParameter("DAQ_time_start")).Atoi());
    time_t daqEnd   = (time_t) (((TString)GetRunParameter("DAQ_time_end")).Atoi());
+   time_t ctpStart = (time_t) (((TString)GetRunParameter("TRGTimeStart")).Atoi());
+   time_t ctpEnd   = (time_t) (((TString)GetRunParameter("TRGTimeEnd")).Atoi());
    
-       fData      = new AliVZERODataDCS(fRun, fStartTime, fEndTime,(UInt_t)daqStart, (UInt_t)daqEnd);
+       fData      = new AliVZERODataDCS(fRun, fStartTime, fEndTime,(UInt_t)daqStart, (UInt_t)daqEnd,(UInt_t)ctpStart, (UInt_t)ctpEnd);
        fFEEData   = new AliVZERODataFEE(fRun, fStartTime, fEndTime);           
    
 }
@@ -128,8 +130,11 @@ UInt_t AliVZEROPreprocessor::Process(TMap* dcsAliasMap)
                                   Log(Form("Cannot open file %s",fileName.Data()));
                                   return 1;}
                Float_t pedMean[128], pedSigma[128], adcMean[128], adcSigma[128] ;
-               for(Int_t j=0; j<128; j++)fscanf(file,"%f %f %f %f",
-                                         &pedMean[j], &pedSigma[j], &adcMean[j], &adcSigma[j]);
+               for(Int_t j=0; j<128; j++) {
+                 Int_t resScan = fscanf(file,"%f %f %f %f",
+                                        &pedMean[j], &pedSigma[j], &adcMean[j], &adcSigma[j]);
+                 if (resScan != 4) Log(Form("Bad data in file %s !",fileName.Data()));
+               }
                fclose(file);
                
                calibData->SetPedestal(pedMean);
@@ -220,14 +225,15 @@ UInt_t AliVZEROPreprocessor::Process(TMap* dcsAliasMap)
     Int_t tempCh;
     Float_t tempAlpha;
     for(Int_t j=0; j<64; ++j) {
-      fscanf(file2,"%d %f", &tempCh, &tempAlpha);
+      Int_t resScan = fscanf(file2,"%d %f", &tempCh, &tempAlpha);
+      if (resScan != 2) Log(Form("Bad data in file %s !",fileName.Data()));
       alpha[tempCh+1] = tempAlpha;
     }
     fclose(file2);
 
     // Check that everything was properly transmitted
     printf("Equalization factors (0->64): ");
-    for(Int_t j=0; j<64; ++j) printf("%.3f ",alpha[j+1]);
+    for(Int_t j=0; j<64; ++j) printf("%.5f ",alpha[j+1]);
     printf("\n");
 
     eqFactors->SetContent(alpha);