X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFPreprocessorFDR.cxx;h=c407b476a576be8d56b14c35372fdc23b985a5d2;hb=dd8324349e5d59e51f863e5025d99ebcba1faf78;hp=ccac4452610ffa0c2f1cc28dba8cbd08eebf46ad;hpb=41024decd24465bf84c1bf1a6c9cd0cade585451;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFPreprocessorFDR.cxx b/TOF/AliTOFPreprocessorFDR.cxx
index ccac4452610..c407b476a57 100644
--- a/TOF/AliTOFPreprocessorFDR.cxx
+++ b/TOF/AliTOFPreprocessorFDR.cxx
@@ -15,6 +15,9 @@
 
 /* 
 $Log$
+Revision 1.4  2007/12/05 13:55:18  zampolli
+Initialization bug fixed.
+
 Revision 1.3  2007/11/27 13:12:30  zampolli
 CDB object run range upper limit extended to AliCDBRunRange::Infinity()
 
@@ -26,21 +29,22 @@ TOF Preprocessor for FDR
 
 */
 
-#include <Riostream.h>
-#include <stdio.h>
-#include <stdlib.h>
+//#include <Riostream.h>
+//#include <stdio.h>
+//#include <stdlib.h>
 
-#include <TFile.h>
+//#include <TFile.h>
 #include <TH1.h>
 #include <TMath.h>
 #include <TObjArray.h>
-#include <TObjString.h>
+//#include <TObjString.h>
 #include <TTimeStamp.h>
 
 #include "AliCDBMetaData.h"
 #include "AliLog.h"
-#include "AliTOFDataDCS.h"
-#include "AliTOFGeometry.h"
+
+//#include "AliTOFDataDCS.h"
+//#include "AliTOFGeometry.h"
 #include "AliTOFPreprocessorFDR.h"
 #include "AliTOFFormatDCS.h"
 #include "AliDCSValue.h"
@@ -62,6 +66,7 @@ AliTOFPreprocessorFDR::AliTOFPreprocessorFDR(AliShuttleInterface* shuttle) :
   fStoreRefData(kTRUE)
 {
   // constructor
+  AddRunType("PHYSICS");
 
 }
 
@@ -124,15 +129,15 @@ UInt_t AliTOFPreprocessorFDR::ProcessDCSDataPoints(TMap* aliasMap)
     TObjArray *array = new TObjArray(4);
     array->SetOwner();
 
-    AliTOFFormatDCS *lv_i48_02 = new AliTOFFormatDCS();
-    AliTOFFormatDCS *lv_v48_02 = new AliTOFFormatDCS();
-    AliTOFFormatDCS *lv_i33_02 = new AliTOFFormatDCS();
-    AliTOFFormatDCS *lv_v33_02 = new AliTOFFormatDCS();
+    AliTOFFormatDCS *lvI4802 = new AliTOFFormatDCS();
+    AliTOFFormatDCS *lvV4802 = new AliTOFFormatDCS();
+    AliTOFFormatDCS *lvI3302 = new AliTOFFormatDCS();
+    AliTOFFormatDCS *lvV3302 = new AliTOFFormatDCS();
     
-    array->AddAt(lv_i48_02,0);
-    array->AddAt(lv_v48_02,1);
-    array->AddAt(lv_i33_02,2);
-    array->AddAt(lv_v33_02,3);
+    array->AddAt(lvI4802,0);
+    array->AddAt(lvV4802,1);
+    array->AddAt(lvI3302,2);
+    array->AddAt(lvV3302,3);
 
     // processing DCS
     
@@ -178,23 +183,23 @@ UInt_t AliTOFPreprocessorFDR::ProcessDCSDataPoints(TMap* aliasMap)
 	time = (Float_t) (aValue->GetTimeStamp());
 	if (i==0){
 	  AliDebug(1,Form("tof_lv_i48_02: setting value %i to %f at %f",k,val,time));
-	  lv_i48_02->SetFloat(k,val);
-	  lv_i48_02->SetTimeStampFloat(k,time);
+	  lvI4802->SetFloat(k,val);
+	  lvI4802->SetTimeStampFloat(k,time);
 	}
 	else if (i==1){
 	  AliDebug(1,Form("tof_lv_v48_02: setting value %i to %f at %f",k,val,time));
-	  lv_v48_02->SetFloat(k,val);
-	  lv_v48_02->SetTimeStampFloat(k,time);
+	  lvV4802->SetFloat(k,val);
+	  lvV4802->SetTimeStampFloat(k,time);
 	}
 	else if (i==2){
 	  AliDebug(1,Form("tof_lv_i33_02: setting value %i to %f at %f",k,val,time));
-	  lv_i33_02->SetFloat(k,val);
-	  lv_i33_02->SetTimeStampFloat(k,time);
+	  lvI3302->SetFloat(k,val);
+	  lvI3302->SetTimeStampFloat(k,time);
 	}
 	else if (i==3){
 	  AliDebug(1,Form("tof_lv_v33_02: setting value %i to %f at %f",k,val,time));
-	  lv_v33_02->SetFloat(k,val);
-	  lv_v33_02->SetTimeStampFloat(k,time);
+	  lvV3302->SetFloat(k,val);
+	  lvV3302->SetTimeStampFloat(k,time);
 	}
       }
   
@@ -225,23 +230,23 @@ UInt_t AliTOFPreprocessorFDR::ProcessDCSDataPoints(TMap* aliasMap)
       for (Int_t kk=0;kk<2;kk++){
 	if (i==0){
 	  AliDebug(1,Form("tof_lv_i48: setting variation %i to %f at %f",kk,delta[kk],timedelta[kk]));
-	  lv_i48_02->SetDelta(kk,delta[kk]);
-	  lv_i48_02->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
+	  lvI4802->SetDelta(kk,delta[kk]);
+	  lvI4802->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
 	}
 	else if (i==1){
 	  AliDebug(1,Form("tof_lv_v48: setting variation %i to %f at %f",kk,delta[kk],timedelta[kk]));
-	  lv_v48_02->SetDelta(kk,delta[kk]);
-	  lv_v48_02->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
+	  lvV4802->SetDelta(kk,delta[kk]);
+	  lvV4802->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
 	}
 	else if (i==2){
 	  AliDebug(1,Form("tof_lv_i33: setting variation %i to %f at %f",kk,delta[kk],timedelta[kk]));
-	  lv_i33_02->SetDelta(kk,delta[kk]);
-	  lv_i33_02->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
+	  lvI3302->SetDelta(kk,delta[kk]);
+	  lvI3302->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
 	}
 	else if (i==3){
 	  AliDebug(1,Form("tof_lv_v33: setting variation %i to %f at %f",kk,delta[kk],timedelta[kk]));
-	  lv_v33_02->SetDelta(kk,delta[kk]);
-	  lv_v33_02->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
+	  lvV3302->SetDelta(kk,delta[kk]);
+	  lvV3302->SetTimeStampDelta(kk,(Float_t)timedelta[kk]);
 	}
       }
     }
@@ -260,13 +265,13 @@ UInt_t AliTOFPreprocessorFDR::ProcessDCSDataPoints(TMap* aliasMap)
     
     Log("Storing DCS Data in OCDB");
     resultDCSMap = Store("Calib","DCSData",array, &metaDataDCS,0,kTRUE);
-    if (!resultDCSStore){
+    if (!resultDCSMap){
       Log("Some problems occurred while storing DCS data results in OCDB, TOF exiting from Shuttle");
       return 3;// return error Code for processed DCS data not stored 
       // in reference data
     }
     
-    if (array) delete array;
+    delete array;
     return 0;
 
   }