From: haavard <haavard@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 25 Apr 2008 11:24:13 +0000 (+0000)
Subject: Updates to include status maps for high voltage sensors
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=9d2ce5396e22a515595328871dbed9cef27b4ee0;hp=ea542e87acc9c0cd34ae216648bbf85850bd0dc5

Updates to include status maps for high voltage sensors
---

diff --git a/TPC/AliTPCPreprocessor.cxx b/TPC/AliTPCPreprocessor.cxx
index 6354f71c760..aa49fa01007 100644
--- a/TPC/AliTPCPreprocessor.cxx
+++ b/TPC/AliTPCPreprocessor.cxx
@@ -57,7 +57,7 @@ ClassImp(AliTPCPreprocessor)
 //______________________________________________________________________________________________
 AliTPCPreprocessor::AliTPCPreprocessor(AliShuttleInterface* shuttle) :
   AliPreprocessor("TPC",shuttle),
-  fConfEnv(0), fTemp(0), fHighVoltage(0), fConfigOK(kTRUE), fROC(0)
+  fConfEnv(0), fTemp(0), fHighVoltage(0), fHighVoltageStat(0), fConfigOK(kTRUE), fROC(0)
 {
   // constructor
   fROC = AliTPCROC::Instance();
@@ -76,7 +76,7 @@ AliTPCPreprocessor::AliTPCPreprocessor(AliShuttleInterface* shuttle) :
 //______________________________________________________________________________________________
  AliTPCPreprocessor::AliTPCPreprocessor(const AliTPCPreprocessor&  ) :
    AliPreprocessor("TPC",0),
-   fConfEnv(0), fTemp(0), fHighVoltage(0), fConfigOK(kTRUE), fROC(0)
+   fConfEnv(0), fTemp(0), fHighVoltage(0), fHighVoltageStat(0), fConfigOK(kTRUE), fROC(0)
  {
 
    Fatal("AliTPCPreprocessor", "copy constructor not implemented");
@@ -158,6 +158,19 @@ void AliTPCPreprocessor::Initialize(Int_t run, UInt_t startTime,
            return;
         }
         fHighVoltage = new AliDCSSensorArray(startTimeLocal, fEndTime, confTree);
+
+   // High voltage status values
+     
+        confTree=0;
+        entry=0;
+        entry = GetFromOCDB("Config", "HighVoltageStat");
+        if (entry) confTree = (TTree*) entry->GetObject();
+        if ( confTree==0 ) {
+           Log("AliTPCPreprocsessor: High Voltage Status Config OCDB entry missing.\n");
+           fConfigOK = kFALSE;
+           return;
+        }
+        fHighVoltageStat = new AliDCSSensorArray(startTimeLocal, fEndTime, confTree);
       }
 }
 
@@ -281,10 +294,10 @@ UInt_t AliTPCPreprocessor::Process(TMap* dcsAliasMap)
 
   // Central Electrode processing
 
-//  if( runType == kPhysicsRunType || runType == kStandAloneRunType || 
-//      runType == kDaqRunType ) {    
+  if( runType == kPhysicsRunType || runType == kStandAloneRunType || 
+      runType == kDaqRunType ) {    
 
-   if (true) {                 // do CE processing for all run types
+//   if (true) {                 // do CE processing for all run types
     Int_t numSources = 1;
     Int_t ceSource[2] = {AliShuttleInterface::kDAQ,AliShuttleInterface::kHLT} ;
     TString source = fConfEnv->GetValue("CE","DAQ");
@@ -382,6 +395,20 @@ UInt_t AliTPCPreprocessor::MapHighVoltage(TMap* dcsAliasMap)
     result=9;
   }
   delete map;
+
+  TMap *map2 = fHighVoltageStat->ExtractDCS(dcsAliasMap);
+  if (map2) {
+    fHighVoltageStat->StoreGraph(map2);
+  } else {
+    Log("No high voltage status recordings extracted. \n");
+    result=9;
+  }
+  delete map2;
+
+  // add status maps to high voltage sensor array
+
+  fHighVoltage->AddSensors(fHighVoltageStat);
+
   // Now store the final CDB file
 
   if ( result == 0 ) {
diff --git a/TPC/AliTPCPreprocessor.h b/TPC/AliTPCPreprocessor.h
index 9e0c54e5bd7..3d5ba9bae1b 100644
--- a/TPC/AliTPCPreprocessor.h
+++ b/TPC/AliTPCPreprocessor.h
@@ -16,7 +16,7 @@ class AliTPCPreprocessor : public AliPreprocessor
 {
   public:
     AliTPCPreprocessor(AliShuttleInterface* shuttle);
-    AliTPCPreprocessor(const AliTPCPreprocessor &);
+    AliTPCPreprocessor(const AliTPCPreprocessor &org);
     virtual ~AliTPCPreprocessor();
 
   protected:
@@ -33,6 +33,7 @@ class AliTPCPreprocessor : public AliPreprocessor
     TEnv                   *fConfEnv;  // Preprocessor configuration map
     AliTPCSensorTempArray  *fTemp;     // CDB class for temperature sensors
     AliDCSSensorArray      *fHighVoltage; // DCS high voltage measurements
+    AliDCSSensorArray      *fHighVoltageStat; // DCS high voltage status
     Bool_t                 fConfigOK;  // Identify succesful reading of OCDB Config
     AliTPCROC              *fROC;      // TPC Read-Out configuration
 
diff --git a/TPC/Config/HighVoltageStat/Run0_999999999_v0_s0.root b/TPC/Config/HighVoltageStat/Run0_999999999_v0_s0.root
new file mode 100644
index 00000000000..eaca8f5dd0a
Binary files /dev/null and b/TPC/Config/HighVoltageStat/Run0_999999999_v0_s0.root differ