...also histos are now correctly booked

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

diff --git a/VZERO/AliVZEROPreprocessor.cxx b/VZERO/AliVZEROPreprocessor.cxx
index d18258f88cd92b730e63cab939b04a0b8a2f4060..23fbcf339799c5428a166f6637f95b567731f863 100644 (file)
--- a/VZERO/AliVZEROPreprocessor.cxx
+++ b/VZERO/AliVZEROPreprocessor.cxx
@@ -70,8 +70,10 @@ void AliVZEROPreprocessor::Initialize(Int_t run, UInt_t startTime,
    // fEndTime   = endTime;
    fStartTime = GetStartTimeDCSQuery ();
    fEndTime   = GetEndTimeDCSQuery ();
-
-       fData      = new AliVZERODataDCS(fRun, fStartTime, fEndTime);
+   time_t daqStart = (time_t) (((TString)GetRunParameter("DAQ_time_start")).Atoi());
+   time_t daqEnd   = (time_t) (((TString)GetRunParameter("DAQ_time_end")).Atoi());
+   
+       fData      = new AliVZERODataDCS(fRun, fStartTime, fEndTime,(UInt_t)daqStart, (UInt_t)daqEnd);
        fFEEData   = new AliVZERODataFEE(fRun, fStartTime, fEndTime);           
    
 }
@@ -97,15 +99,10 @@ UInt_t AliVZEROPreprocessor::Process(TMap* dcsAliasMap)
   if(!dcsAliasMap) return 1;
 
        // The Processing of the DCS input data is forwarded to AliVZERODataDCS
-
        fData->ProcessData(*dcsAliasMap);
-       //fData->Draw("");              // Draws the HV values as a function of time
-       //dcsAliasMap->Print("");       // Prints out the HV values
 
-       // Writes VZERO PMs HV values into VZERO calibration object
-       calibData->SetMeanHV(fData->GetMeanHV());
-       calibData->SetWidthHV(fData->GetWidthHV());
-       calibData->SetDeadMap(fData->GetDeadMap());
+       // Writes VZERO PMs HV values into VZERO calibration object and Timing resolution parameters
+       calibData->FillDCSData(fData);
           
    // *************** From DAQ ******************
    
@@ -119,7 +116,7 @@ UInt_t AliVZEROPreprocessor::Process(TMap* dcsAliasMap)
        sourceList->Print();    
 
        TIter iter(sourceList);
-       TObjString *source = 0;
+       TObjString *source;
                
        while((source=dynamic_cast<TObjString*> (iter.Next()))){
                fileName = GetFile(kDAQ, sourcesId.Data(), source->GetName());
@@ -136,7 +133,6 @@ UInt_t AliVZEROPreprocessor::Process(TMap* dcsAliasMap)
                
                calibData->SetPedestal(pedMean);
                calibData->SetSigma(pedSigma);                  
-               calibData->SetGain(adcMean); 
                calibData->SetADCsigma(adcSigma);
                }