addtional DSC alias from Tomek

diff --git a/T0/AliT0DataDCS.cxx b/T0/AliT0DataDCS.cxx
index 750d02b0fa371e528b6cb0a268874f42d2c739ec..79f6db294555137441240818ffac64cc2e691f5d 100644 (file)
--- a/T0/AliT0DataDCS.cxx
+++ b/T0/AliT0DataDCS.cxx
@@ -54,6 +54,13 @@ AliT0DataDCS::AliT0DataDCS():
        fStartTimeDCSQuery(0),
        fEndTimeDCSQuery(0),
        fAtten(0.),
+       fMPDcentA(0),
+        fMPDcentC(0),
+        fMPDsemiCentA(0),
+        fMPDsemiCentC(0),
+        fTVDCtop(0),
+        fTVDCbottom(0),
+       fMPDmode(0),
        fIsProcessed(kFALSE)
 {
   for(Int_t i=0;i<kScalers;i++) 
@@ -94,6 +101,13 @@ AliT0DataDCS::AliT0DataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime, UInt_t
        fStartTimeDCSQuery(startTimeDCSQuery),
        fEndTimeDCSQuery(endTimeDCSQuery),
        fAtten(0.),
+       fMPDcentA(0),
+       fMPDcentC(0),
+       fMPDsemiCentA(0),
+       fMPDsemiCentC(0),
+       fTVDCtop(0),
+       fTVDCbottom(0),
+       fMPDmode(0),
        fIsProcessed(kFALSE)
 {
   for(Int_t i=0;i<kScalers;i++)
@@ -143,6 +157,13 @@ AliT0DataDCS::AliT0DataDCS(const AliT0DataDCS & data):
   fStartTimeDCSQuery(0),
   fEndTimeDCSQuery(0),
   fAtten(0.),
+  fMPDcentA(0),
+  fMPDcentC(0),
+  fMPDsemiCentA(0),
+  fMPDsemiCentC(0),
+  fTVDCtop(0),
+  fTVDCbottom(0),
+  fMPDmode(0),
   fIsProcessed(kFALSE)
 {
 
@@ -155,7 +176,13 @@ AliT0DataDCS::AliT0DataDCS(const AliT0DataDCS & data):
   fEndTimeDCSQuery=data.fEndTimeDCSQuery;
   fIsProcessed=data.fIsProcessed;
   fAtten=data.fAtten;
-
+  fMPDcentA=data.fMPDcentA;
+  fMPDcentC=data.fMPDcentC;
+  fMPDsemiCentA=data.fMPDsemiCentA;
+  fMPDsemiCentC=data.fMPDsemiCentC;
+  fTVDCtop=data.fTVDCtop;
+  fTVDCbottom=data.fTVDCbottom;
+  fMPDmode=data.fMPDmode;
   for(int i=0;i<kNAliases;i++) 
   {
     fAliasNames[i]=data.fAliasNames[i];
@@ -235,7 +262,14 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap)
                 Float_t t0_ac_trm[kTRM];
                 Float_t t0_ac_drm[kDRM];
                Float_t t0_atten=0.;
-
+               Int_t t0_MPDcentA=0;
+               Int_t t0_MPDcentC=0;
+               Int_t t0_MPDsemiCentA=0;
+               Int_t t0_MPDsemiCentC=0;
+               Int_t t0_TVDCtop=0;
+               Int_t t0_TVDCbottom=0;                  
+               Int_t t0_MPDmode=0;
+       
                TObjArray *aliasArr;
                for(Int_t k=0; k<kScalers; k++)
                {
@@ -456,7 +490,7 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap)
                     }
                     fDRM[j-(2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM)] = t0_ac_drm[j-(2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM)] / aliasEntr[j];
                   }
-                  else
+                  else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+kAtten)
                   {
                     aliasEntr[j] = aliasArr->GetEntries();
                    for(Int_t l=0; l<aliasEntr[j]; l++)
@@ -466,6 +500,76 @@ Bool_t AliT0DataDCS::ProcessData(TMap& aliasMap)
                     }
                     fAtten = t0_atten / aliasEntr[j];
                   }
+                 else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+2*kAtten)
+                  {
+                    aliasEntr[j] = aliasArr->GetEntries();
+                    for(Int_t l=0; l<aliasEntr[j]; l++)
+                    {
+                      AliDCSValue *aValue=dynamic_cast<AliDCSValue*> (aliasArr->At(l));
+                      t0_MPDcentA += aValue->GetInt();
+                    }
+                    fMPDcentA = t0_MPDcentA / aliasEntr[j];
+                  }
+                 else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+3*kAtten)
+                  {
+                    aliasEntr[j] = aliasArr->GetEntries();
+                    for(Int_t l=0; l<aliasEntr[j]; l++)
+                    {
+                      AliDCSValue *aValue=dynamic_cast<AliDCSValue*> (aliasArr->At(l));
+                      t0_MPDcentC += aValue->GetInt();
+                    }
+                    fMPDcentC = t0_MPDcentC / aliasEntr[j];
+                  }
+                  else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+4*kAtten)
+                  {
+                    aliasEntr[j] = aliasArr->GetEntries();
+                    for(Int_t l=0; l<aliasEntr[j]; l++)
+                    {
+                      AliDCSValue *aValue=dynamic_cast<AliDCSValue*> (aliasArr->At(l));
+                      t0_MPDsemiCentA += aValue->GetInt();
+                    }
+                    fMPDsemiCentA = t0_MPDsemiCentA / aliasEntr[j];
+                  }
+                 else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+5*kAtten)
+                  {
+                    aliasEntr[j] = aliasArr->GetEntries();
+                    for(Int_t l=0; l<aliasEntr[j]; l++)
+                    {
+                      AliDCSValue *aValue=dynamic_cast<AliDCSValue*> (aliasArr->At(l));
+                      t0_MPDsemiCentC += aValue->GetInt();
+                    }
+                    fMPDsemiCentC = t0_MPDsemiCentC / aliasEntr[j];
+                  }
+                 else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+6*kAtten)
+                  {
+                    aliasEntr[j] = aliasArr->GetEntries();
+                    for(Int_t l=0; l<aliasEntr[j]; l++)
+                    {
+                      AliDCSValue *aValue=dynamic_cast<AliDCSValue*> (aliasArr->At(l));
+                      t0_TVDCtop += aValue->GetInt();
+                    }
+                    fTVDCtop = t0_TVDCtop / aliasEntr[j];
+                  }
+                 else if (j < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+7*kAtten)
+                  {
+                    aliasEntr[j] = aliasArr->GetEntries();
+                    for(Int_t l=0; l<aliasEntr[j]; l++)
+                    {
+                      AliDCSValue *aValue=dynamic_cast<AliDCSValue*> (aliasArr->At(l));
+                      t0_TVDCbottom += aValue->GetInt();
+                    }
+                    fTVDCbottom = t0_TVDCbottom / aliasEntr[j];
+                  }
+                 else
+                  {
+                    aliasEntr[j] = aliasArr->GetEntries();
+                    for(Int_t l=0; l<aliasEntr[j]; l++)
+                    {
+                      AliDCSValue *aValue=dynamic_cast<AliDCSValue*> (aliasArr->At(l));
+                      t0_MPDmode += aValue->GetInt();
+                    }
+                    fMPDmode = t0_MPDmode / aliasEntr[j];
+                 }
                }
        fIsProcessed=kTRUE;
        return kTRUE;
@@ -573,11 +677,38 @@ void AliT0DataDCS::Init()
                   sindex.Form("%02d",i-(2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM));
                   fAliasNames[i] += sindex;
                 }
-               else
+               else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+kAtten)
                {
                   fAliasNames[i] = "t00_ac_atten";
                 }
-
+                else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+2*kAtten)
+                {
+                  fAliasNames[i] = "t00_a_mpd_cent";
+                }
+               else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+3*kAtten)
+                {
+                  fAliasNames[i] = "t00_c_mpd_cent";
+                }
+               else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+4*kAtten)
+                {
+                  fAliasNames[i] = "t00_a_mpd_scent";
+                }
+                else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+5*kAtten)
+                {
+                  fAliasNames[i] = "t00_c_mpd_scent";
+                }
+               else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+6*kAtten)
+                {
+                  fAliasNames[i] = "t00_ac_tvdc_top";
+                }
+                else if (i < 2*kScalers+4*kHV+4*kLV+4*kCFD+kTRM+kDRM+7*kAtten)
+                {
+                  fAliasNames[i] = "t00_ac_tvdc_bottom";
+                }
+               else
+               {
+                  fAliasNames[i] = "t00_ac_mpd_mode";
+                }
        }
 
 }

diff --git a/T0/AliT0DataDCS.h b/T0/AliT0DataDCS.h
index 035de5654d6b8e41bfee82d79fdad8ddf763eda4..f9d1443e8a6aafd1e022aa856ca246bc30761c5a 100644 (file)
--- a/T0/AliT0DataDCS.h
+++ b/T0/AliT0DataDCS.h
@@ -14,7 +14,7 @@
 
 class AliT0DataDCS : public TObject {
 public:
-       enum {kNAliases=184, kHV=12, kLV=2, kCFD=12, kScalers=32, kTRM=10, kDRM=5}; //184
+       enum {kNAliases=191, kHV=12, kLV=2, kCFD=12, kScalers=32, kTRM=10, kDRM=5, kAtten=1}; // 191 T0 aliases
 
        AliT0DataDCS();
        AliT0DataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime, UInt_t startTimeDCSQuery, UInt_t endTimeDCSQuery);
@@ -40,28 +40,35 @@ private:
        void Init();
        void Introduce(UInt_t numAlias, const TObjArray* aliasArr)const;
 
-       Int_t fRun;                     // Run number
-       UInt_t fStartTime;              // Start time
-       UInt_t fEndTime;                // End time
-       Int_t fStartTimeDCSQuery;       // Begin time DCSQuery
-       Int_t fEndTimeDCSQuery;         // End time DCSQuery
-       Float_t fHViA[kHV];             // Mean value of HV current in uA on A-side
-       Float_t fHVvA[kHV];             // Mean value of HV voltage in V on A-side
-       Float_t fLViA[kLV];             // Mean value of LV current in uA on A-side
-       Float_t fLVvA[kLV];             // Mean value of LV voltage in V on A-side
-       Float_t fHViC[kHV];             // Mean value of HV current in uA on C-side
-        Float_t fHVvC[kHV];            // Mean value of HV voltage in V on C-side
-        Float_t fLViC[kLV];            // Mean value of LV current in uA on C-side
-        Float_t fLVvC[kLV];            // Mean value of LV voltage in V on C-side
-       Float_t fCFDtA[kCFD];           // Mean threshold on CFD in V on A-side 
-       Float_t fCFDwA[kCFD];           // Mean walk on CFD in V on A-side
-       Float_t fCFDtC[kCFD];           // Mean threshold on CFD in V on C-side
-        Float_t fCFDwC[kCFD];          // Mean walk on CFD in V on C-side
-        Float_t fScalerMean[kScalers];  // Mean value of T0 scaler counts from the entire run
-        Float_t fScalerSecMean[kScalers]; // Mean value of T0 scaler counts per second
-       Float_t fTRM[kTRM];             // Mean temperature on TRM in degrees of Celsius
-       Float_t fDRM[kDRM];             // Mean temperature on DRM in degrees of Celsius
-       Float_t fAtten;                 // Laser amplitude in MIPs
+       Int_t fRun;                             // Run number
+       UInt_t fStartTime;                      // Start time
+       UInt_t fEndTime;                        // End time
+       Int_t fStartTimeDCSQuery;               // Begin time DCSQuery
+       Int_t fEndTimeDCSQuery;                 // End time DCSQuery
+       Float_t fHViA[kHV];                     // Mean value of HV current in uA on A-side
+       Float_t fHVvA[kHV];                     // Mean value of HV voltage in V on A-side
+       Float_t fLViA[kLV];                     // Mean value of LV current in uA on A-side
+       Float_t fLVvA[kLV];                     // Mean value of LV voltage in V on A-side
+       Float_t fHViC[kHV];                     // Mean value of HV current in uA on C-side
+        Float_t fHVvC[kHV];                    // Mean value of HV voltage in V on C-side
+        Float_t fLViC[kLV];                    // Mean value of LV current in uA on C-side
+        Float_t fLVvC[kLV];                    // Mean value of LV voltage in V on C-side
+       Float_t fCFDtA[kCFD];                   // Mean threshold on CFD in V on A-side 
+       Float_t fCFDwA[kCFD];                   // Mean walk on CFD in V on A-side
+       Float_t fCFDtC[kCFD];                   // Mean threshold on CFD in V on C-side
+        Float_t fCFDwC[kCFD];                  // Mean walk on CFD in V on C-side
+        Float_t fScalerMean[kScalers];         // Mean value of T0 scaler counts from the entire run
+        Float_t fScalerSecMean[kScalers];      // Mean value of T0 scaler counts per second
+       Float_t fTRM[kTRM];                     // Mean temperature on TRM in degrees of Celsius
+       Float_t fDRM[kDRM];                     // Mean temperature on DRM in degrees of Celsius
+       Float_t fAtten;                         // Laser amplitude in MIPs
+       Int_t fMPDcentA;                        // Multiplicity Discriminator central on A-side
+       Int_t fMPDcentC;                        // Multiplicity Discriminator central on C-side
+        Int_t fMPDsemiCentA;                   // Multiplicity Discriminator semi-central on A-side
+        Int_t fMPDsemiCentC;                   // Multiplicity Discriminator semi-central on C-side
+       Int_t fTVDCtop;                         // T0 Vertex Unit top
+       Int_t fTVDCbottom;                      // T0 Vertex Unit bottom
+       Int_t fMPDmode;                       // Multiplicity Discriminator on C-side only, A-side only, or both sides
        TString fAliasNames[kNAliases];         // T0 data points aliases  
        Bool_t fIsProcessed;                    // status - was processing data successful
        ClassDef(AliT0DataDCS, 3);

diff --git a/T0/TestPreprocessor.C b/T0/TestPreprocessor.C
index a7172a21da71afc9d446cd14ffd59c5234b76630..9f872ce7a4aaba253fbb2a5cf99f3e89e91ed889 100644 (file)
--- a/T0/TestPreprocessor.C
+++ b/T0/TestPreprocessor.C
@@ -50,7 +50,7 @@ TMap* CreateDCSAliasMap()
   aliasMap->SetOwner(1);
 
   TString aliasName;
-  Int_t n_T0aliases=184;
+  Int_t n_T0aliases=191;
   Int_t nValues=10;    
   
   for(int nAlias=0;nAlias<n_T0aliases;nAlias++)
@@ -121,9 +121,37 @@ TMap* CreateDCSAliasMap()
     {
       aliasName=Form("t00_ac_drm_%02d",nAlias-178);
     }
+    else if (nAlias < 184)
+    {
+      aliasName=Form("t00_ac_atten");
+    }
+    else if(nAlias < 185)
+    {
+      aliasName=Form("t00_a_mpd_cent");
+    }
+    else if(nAlias < 186)
+    {
+      aliasName=Form("t00_c_mpd_cent");
+    }
+    else if(nAlias < 187)
+    {
+      aliasName=Form("t00_a_mpd_scent");
+    }
+    else if(nAlias < 188)
+    {
+      aliasName=Form("t00_c_mpd_scent");
+    }
+    else if(nAlias < 189)
+    {
+      aliasName=Form("t00_ac_tvdc_top");
+    }
+    else if(nAlias < 190)
+    {
+      aliasName=Form("t00_ac_tvdc_bottom");
+    }
     else
     {
-      aliasName=Form("t00_ac_atten",nAlias-183);
+      aliasName=Form("t00_ac_mpd_mode");               
     }
 
     for (int timeStamp=0;timeStamp<nValues;timeStamp++)
@@ -151,7 +179,7 @@ void WriteDCSAliasMap()
 
   AliCDBMetaData metaData;
        metaData.SetBeamPeriod(0);
-       metaData.SetResponsible("Responsible person");
+       metaData.SetResponsible("Tomek");
        metaData.SetComment("Test object for TestPreprocessor.C");
 
   AliCDBId id("DET/DCS/Data", 0, 0);