X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=VZERO%2FAliVZEROPreprocessor.cxx;h=716ace2b6b59fad7a1acfb7f2632d15f7b5ebb0c;hb=da2d199e7a43dca38046efcbf1dae1a5648aa5a5;hp=d18258f88cd92b730e63cab939b04a0b8a2f4060;hpb=7495d2be0edda4adf14e38a43b57727e5f35e011;p=u%2Fmrichter%2FAliRoot.git

diff --git a/VZERO/AliVZEROPreprocessor.cxx b/VZERO/AliVZEROPreprocessor.cxx
index d18258f88cd..716ace2b6b5 100644
--- 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 ******************
    
@@ -136,7 +133,6 @@ UInt_t AliVZEROPreprocessor::Process(TMap* dcsAliasMap)
 	    	
 		calibData->SetPedestal(pedMean);
 		calibData->SetSigma(pedSigma);			
-		calibData->SetGain(adcMean); 
 		calibData->SetADCsigma(adcSigma);
 		}