X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FTOFPreprocessor.C;h=905c9b8bb6f033eac984211b7396628cd5d328b4;hb=a4f7a3a1f3b853ae2502de3bf4bb8a071221cf7a;hp=85930df1e16c0fda239d1929a3ada24e809b7381;hpb=5abdf772dde0abee45b5ca28fa37f76d7e5eb19a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/TOFPreprocessor.C b/TOF/TOFPreprocessor.C
index 85930df1e16..905c9b8bb6f 100644
--- a/TOF/TOFPreprocessor.C
+++ b/TOF/TOFPreprocessor.C
@@ -31,7 +31,7 @@ void TOFPreprocessor()
   shuttle->AddInputFile(AliTestShuttle::kDAQ, "TOF", "RUNLevel", "MON", "$ALICE_ROOT/TOF/ShuttleInput/Partial.root");
 
   // instantiation of the preprocessor
-  AliPreprocessor* pp = new AliTOFPreprocessor("TOF", shuttle);
+  AliPreprocessor* pp = new AliTOFPreprocessor(shuttle);
 
   // preprocessing
   shuttle->Process();
@@ -55,14 +55,11 @@ TMap* CreateDCSAliasMap()
 {
   // Creates a DCS structure
   // The structure is the following:
-  //   TMap (key --> value)
-  //     <DCSAlias> --> <valueList>
-  //     <DCSAlias> is a string
-  //     <valueList> is a TObjArray of AliDCSValue
-  //     An AliDCSValue consists of timestamp and a value in form of a AliSimpleValue
+  // TMap (key --> value)
+  // <DCSAlias> --> <valueList>
+  // <DCSAlias> is a string
+  // <valueList> is a TObjArray of AliDCSValue
 
-  // In this example 6 aliases exists: DCSAlias1 ... DCSAlias6
-  // Each contains 1000 values randomly generated by TRandom::Gaus + 5*nAlias
 
   TMap* aliasMap = new TMap;
   aliasMap->SetOwner(1);
@@ -75,88 +72,190 @@ TMap* CreateDCSAliasMap()
   delete datime;
   Int_t iseed = TMath::Abs(10000 * pid + time - date); 
 
-  //Float_t thrHVv=7.75, thrHVc=3, thrLVv=2.75, thrLVc=2.5,
-  //thrFEEthr=1.5, thrFEEt=10, thrTemp=35, thrPress=1000;
-  Float_t tentHVv=6.75, tentHVc=2, tentLVv=1.75, tentLVc=1.5,
-    tentFEEthr=0.5, tentFEEt=20, tentTemp=25, tentPress=900;
-  Float_t sigmaHVv=1, sigmaHVc=0.25, sigmaLVv=0.25, sigmaLVc=0.25,
-    sigmaFEEthr=0.05, sigmaFEEt=5, sigmaTemp=1, sigmaPress=10;
+  Float_t tentHVv=6500, tentHVi=80, tentLVv=2.7, tentLVi=4.5,
+    tentLVv33=3.3, tentLVv50=5.0, tentLVv48=48,
+    tentLVi33=100, tentLVi50=3.0, tentLVi48=10,
+    tentFEEthr=1.0, tentFEEtfeac=25, tentFEEttrm=45, 
+    tentTemp=25, tentPress=900;
+  Float_t sigmaHVv=10, sigmaHVi=10, sigmaLVv=0.2, sigmaLVi=1.0,
+    sigmaLVv33=0.1, sigmaLVv50=0.1, sigmaLVv48=1,
+    sigmaLVi33=10, sigmaLVi50=0.5, sigmaLVi48=2,
+    sigmaFEEthr=0.1, sigmaFEEtfeac=10, sigmaFEEttrm=4, 
+    sigmaTemp=1, sigmaPress=10;
 
   Float_t tent=0, sigma=0, thr=0;
-  Int_t NAliases=10442, NHV=90, NLV=576, NFEEthr=1152, NFEEt=7776, NT=1, NP=1;
+  Int_t NAliases=10514, NHV=90, NLV=576, NLV33=72, NLV50=72, NLV48=72, NFEEthr=1152, NFEEtfeac=576, NFEEttrm=6840, NT=1, NP=1;
 
   for(int nAlias=0;nAlias<NAliases;nAlias++) {
 
     TObjArray* valueSet = new TObjArray;
     valueSet->SetOwner(1);
 
+    TString sindex;
     TString aliasName;
     if (nAlias<NHV){
-      aliasName = "HVvpos";
-      aliasName += nAlias;
+      aliasName = "tof_hv_vp_";
+      sindex.Form("%02i",nAlias);
+      aliasName += sindex;
+      //aliasName += nAlias;
       tent=tentHVv;
       sigma=sigmaHVv;
       //      thr=thrHVv;
     }
     else if (nAlias<NHV*2){
-      aliasName = "HVvneg";
-      aliasName += nAlias-NHV;
+      //      aliasName = "HVvneg";
+      //aliasName += nAlias-NHV;
+      aliasName = "tof_hv_vn_";
+      sindex.Form("%02i",nAlias-NHV);
+      aliasName += sindex;
       tent=-tentHVv;
       sigma=-sigmaHVv;
       //thr=-thrHVv;
     }
     else if (nAlias<NHV*3){
-      aliasName = "HVcpos";
-      aliasName += nAlias-2*NHV;
-      tent=tentHVc;
-      sigma=sigmaHVc;
+      //      aliasName = "HVcpos";
+      //aliasName += nAlias-2*NHV;
+      aliasName = "tof_hv_ip_";
+      sindex.Form("%02i",nAlias-2*NHV);
+      aliasName += sindex;
+      tent=tentHVi;
+      sigma=sigmaHVi;
       //thr=thrHVc;
     }
     else if (nAlias<NHV*4){
-      aliasName = "HVcneg";
-      aliasName += nAlias-3*NHV;
-      tent=-tentHVc;
-      sigma=-sigmaHVc;
+      //      aliasName = "HVcneg";
+      //aliasName += nAlias-3*NHV;
+      aliasName = "tof_hv_in_";
+      sindex.Form("%02i",nAlias-3*NHV);
+      aliasName += sindex;
+      tent=-tentHVi;
+      sigma=-sigmaHVi;
       //thr=-thrHVc;
     }
     else if (nAlias<NHV*4+NLV){
-      aliasName = "LVv";
-      aliasName += nAlias-4*NHV;
+      //      aliasName = "LVv";
+      //aliasName += nAlias-4*NHV;
+      aliasName = "tof_lv_vfea_";
+      sindex.Form("%03i",nAlias-4*NHV);
+      aliasName += sindex;
       tent=tentLVv;
       sigma=sigmaLVv;
       //thr=thrLVv;
     }
     else if (nAlias<NHV*4+2*NLV){
-      aliasName = "LVc";
-      aliasName += nAlias-(4*NHV+NLV);
-      tent=tentLVc;
-      sigma=sigmaLVc;
+      //      aliasName = "LVc";
+      //aliasName += nAlias-(4*NHV+NLV);
+      aliasName = "tof_lv_ifea_";
+      sindex.Form("%03i",nAlias-(4*NHV+NLV));
+      aliasName += sindex;
+      tent=tentLVi;
+      sigma=sigmaLVi;
       //thr=thrLVc;
     }
-    else if (nAlias<NHV*4+2*NLV+NFEEthr){
-      aliasName = "FEEthr";
-      aliasName += nAlias-(4*NHV+2*NLV);
+    else if (nAlias<NHV*4+2*NLV+NLV33){
+      //      aliasName = "LVc";
+      //aliasName += nAlias-(4*NHV+NLV);
+      aliasName = "tof_lv_v33_";
+      sindex.Form("%02i",nAlias-(4*NHV+2*NLV));
+      aliasName += sindex;
+      tent=tentLVv33;
+      sigma=sigmaLVv33;
+      //thr=thrLVc;
+    }
+    else if (nAlias<NHV*4+2*NLV+2*NLV33){
+      //      aliasName = "LVc";
+      //aliasName += nAlias-(4*NHV+NLV);
+      aliasName = "tof_lv_i33_";
+      sindex.Form("%02i",nAlias-(4*NHV+2*NLV+NLV33));
+      aliasName += sindex;
+      tent=tentLVi33;
+      sigma=sigmaLVi33;
+      //thr=thrLVc;
+    }
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+NLV50){
+      //      aliasName = "LVc";
+      //aliasName += nAlias-(4*NHV+NLV);
+      aliasName = "tof_lv_v50_";
+      sindex.Form("%02i",nAlias-(4*NHV+2*NLV+2*NLV33));
+      aliasName += sindex;
+      tent=tentLVv50;
+      sigma=sigmaLVv50;
+      //thr=thrLVc;
+    }
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+2*NLV50){
+      //      aliasName = "LVc";
+      //aliasName += nAlias-(4*NHV+NLV);
+      aliasName = "tof_lv_i50_";
+      sindex.Form("%02i",nAlias-(4*NHV+2*NLV+2*NLV33+NLV50));
+      aliasName += sindex;
+      tent=tentLVi50;
+      sigma=sigmaLVi50;
+      //thr=thrLVc;
+    }
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+2*NLV50+NLV48){
+      //      aliasName = "LVc";
+      //aliasName += nAlias-(4*NHV+NLV);
+      aliasName = "tof_lv_v48_";
+      sindex.Form("%02i",nAlias-(4*NHV+2*NLV+2*NLV33+2*NLV50));
+      aliasName += sindex;
+      tent=tentLVv48;
+      sigma=sigmaLVv48;
+      //thr=thrLVc;
+    }
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+2*NLV50+2*NLV48){
+      //      aliasName = "LVc";
+      //aliasName += nAlias-(4*NHV+NLV);
+      aliasName = "tof_lv_i48_";
+      sindex.Form("%02i",nAlias-(4*NHV+2*NLV+2*NLV33+2*NLV50+NLV48));
+      aliasName += sindex;
+      tent=tentLVi48;
+      sigma=sigmaLVi48;
+      //thr=thrLVc;
+    }
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+2*NLV50+2*NLV48+NFEEthr){
+      //      aliasName = "FEEthr";
+      //aliasName += nAlias-(4*NHV+2*NLV-(4*NHV+2*NLV+2*NLV33+2*NLV50+2*NLV48));
+      aliasName = "tof_fee_th_";
+      sindex.Form("%04i",nAlias-(4*NHV+2*NLV+2*NLV33+2*NLV50+2*NLV48));
+      aliasName += sindex;
       tent=tentFEEthr;
       sigma=sigmaFEEthr;
       //thr=thrFEEthr;
     }
-    else if (nAlias<NHV*4+2*NLV+NFEEthr+NFEEt){
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+2*NLV50+2*NLV48+NFEEthr+NFEEtfeac){
+      //cout << " nalias fee temp = " << nAlias << endl;
+      //      aliasName = "FEEt";
+      //aliasName += nAlias-(4*NHV+2*NLV+NFEEthr);
+      aliasName = "tof_fee_tfeac_";
+      sindex.Form("%03i",nAlias-(4*NHV+2*NLV+2*NLV33+2*NLV50+2*NLV48+NFEEthr));
+      aliasName += sindex;
+      //cout << " nalias fee temp name = " << aliasName << endl;
+      tent=tentFEEtfeac;
+      sigma=sigmaFEEtfeac;
+      //thr=thrFEEthr;
+    }
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+2*NLV50+2*NLV48+NFEEthr+NFEEtfeac+NFEEttrm){
       //cout << " nalias fee temp = " << nAlias << endl;
-      aliasName = "FEEt";
-      aliasName += nAlias-(4*NHV+2*NLV+NFEEthr);
+      //      aliasName = "FEEt";
+      //aliasName += nAlias-(4*NHV+2*NLV+NFEEthr);
+      aliasName = "tof_fee_ttrm_";
+      sindex.Form("%04i",nAlias-(4*NHV+2*NLV+2*NLV33+2*NLV50+2*NLV48+NFEEthr+NFEEtfeac));
+      aliasName += sindex;
       //cout << " nalias fee temp name = " << aliasName << endl;
-      tent=tentFEEt;
-      sigma=sigmaFEEt;
+      tent=tentFEEttrm;
+      sigma=sigmaFEEttrm;
       //thr=thrFEEthr;
     }
-    else if (nAlias<NHV*4+2*NLV+NFEEthr+NFEEt+1){
-      aliasName = "Temperature";
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+2*NLV50+2*NLV48+NFEEthr+NFEEtfeac+NFEEttrm+1){
+      cout << " putting temperature" << endl;
+      aliasName = "temperature";
       tent=tentTemp;
       sigma=sigmaTemp;
       //thr=thrTemp;
     }
-    else if (nAlias<NHV*4+2*NLV+NFEEthr+NFEEt+2){
-      aliasName = "Pressure";
+    else if (nAlias<NHV*4+2*NLV+2*NLV33+2*NLV50+2*NLV48+NFEEthr+NFEEtfeac+NFEEttrm+2){
+      cout << " putting pressure" << endl;
+      aliasName = "pressure";
       tent=tentPress;
       sigma=sigmaPress;
       //thr=thrPress;