Merge remote-tracking branch 'origin/flatdev' into mergeFlat2Master

[u/mrichter/AliRoot.git] / T0 / AliT0Preprocessor.cxx

diff --git a/T0/AliT0Preprocessor.cxx b/T0/AliT0Preprocessor.cxx
index 1ca8b37a55e77345dbc25d13d9897cfd14c95269..e3b69f3d5f85828a09bbaedf90811585a2bbf2dc 100644 (file)
--- a/T0/AliT0Preprocessor.cxx
+++ b/T0/AliT0Preprocessor.cxx
@@ -91,15 +91,11 @@ Bool_t AliT0Preprocessor::ProcessDCS(){
        TString runType = GetRunType();
        Log(Form("ProcessDCS - RunType: %s",runType.Data()));
 
-       if((runType == "STANDALONE")||
-          (runType == "PHYSICS") 
-          || (runType == "AMPLITUDE_CALIBRATION")){
-
-         //      return kFALSE;
-               return kTRUE;
-       }else{
-       return kFALSE;
-       }
+       if(runType == "PHYSICS" )
+         return kTRUE;
+       else
+         return kFALSE;
+       
 }
 //____________________________________________________
 
@@ -148,9 +144,9 @@ UInt_t AliT0Preprocessor::ProcessLaser()
   Bool_t resultLaser = kFALSE;
   Bool_t writeok = kFALSE;
   //processing DAQ
-  TObjString *source;
   TList* list = GetFileSources(kDAQ, "AMPLITUDE_CALIBRATION");
   AliT0CalibWalk *laser = new AliT0CalibWalk();
+  TObjString *source;
   if (list)
     {
       TIter iter(list);
@@ -159,7 +155,7 @@ UInt_t AliT0Preprocessor::ProcessLaser()
          const char *laserFile = GetFile(kDAQ, "AMPLITUDE_CALIBRATION", source->GetName());
          if (laserFile)
            {
-             Log(Form("File with Id LASER found in source %s!", source->GetName()));
+             Log(Form("File with Id AMPLITUDE_CALIBRAION found in source %s!", source->GetName()));
             writeok = laser->MakeWalkCorrGraph(laserFile);
              
            }
@@ -167,32 +163,28 @@ UInt_t AliT0Preprocessor::ProcessLaser()
       
       AliCDBMetaData metaData;
       metaData.SetBeamPeriod(0);
-      metaData.SetResponsible("Tomek&Michal");
+      metaData.SetResponsible("Alla");
       metaData.SetComment("Walk correction from laser runs.");
       if (writeok) resultLaser=Store("Calib","Slewing_Walk", laser, &metaData, 0, 1);
       else {
-       
+       
        Log(Form("writeok = %d no peaks in CFD spectra",writeok));
        return 0;
       }                  
       Log(Form("resultLaser = %d",resultLaser));
+      if (!resultLaser)
+       {
+         Log("No Laser Data stored");
+         return 3;//return error code for failure in storing Laser Data
+       }
     }
   else
     {
-      Log(Form("Could not find file with Id LASER in source %s!", source->GetName()));
+      Log(Form("Could not find file with Id  AMPLITUDE_CALIBRAION "));
       return 1;
     }
   
-  if (!resultLaser)
-    {
-      Log("No Laser Data stored");
-      return 3;//return error code for failure in storing Laser Data
-    }
-  else {
-    Log("No sources found for id LASER!");
-    return 1;
-  }
-  return 0;
+   return 0;
 }
 
 //____________________________________________________