]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Changes to write E calib. object
authorcoppedis <coppedis@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 11 Nov 2010 08:11:38 +0000 (08:11 +0000)
committercoppedis <coppedis@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 11 Nov 2010 08:11:38 +0000 (08:11 +0000)
ZDC/AliZDCPreprocessor.cxx
ZDC/TestZDCPreprocessor.C

index c0e8a5f2bb39d523eccd55c25ec4835194399836..73544fdc35bfc6681d348516d199a8f77045f656 100644 (file)
@@ -439,8 +439,9 @@ UInt_t AliZDCPreprocessor::ProcessCalibData(Float_t beamEnergy)
       for(Int_t j=0; j<6; j++){        
         if(j<6){
           int iread = fscanf(file,"%f",&fitValEMD[j]);
-          if(iread==0) AliDebug(3," Failing reading daa from EMD calibration data file");
-          eCalib->SetEnCalib(j, beamEnergy/fitValEMD[j]);
+          if(iread==0) AliDebug(3," Failing reading data from EMD calibration data file");
+          if(fitValEMD[j]!=1.) eCalib->SetEnCalib(j, beamEnergy/fitValEMD[j]);
+         else eCalib->SetEnCalib(j, fitValEMD[j]);
         }
       }
       //
index 78d324bbee7f2d94b5d7009806b8f181bb294328..7c3b554225a2cb0ec1f02b5ae93d7215bd286050 100644 (file)
@@ -90,8 +90,9 @@ void TestZDCPreprocessor(const char* runType="PHYSICS")
   // To test it, we must provide the run parameters manually. They will be retrieved in the preprocessor
   // using GetRunParameter function.
   // In real life the parameters will be retrieved automatically from the run logbook;
-  //shuttle->AddInputRunParameter("beamType", "A-A");
-  shuttle->AddInputRunParameter("beamType", "p-p");
+  shuttle->AddInputRunParameter("beamType", "A-A");
+  shuttle->AddInputRunParameter("beamEnergy", "1380");
+  //shuttle->AddInputRunParameter("beamType", "p-p");
   shuttle->AddInputRunParameter("totalEvents", "1000");
   shuttle->AddInputRunParameter("NumberOfGDCs", "1");