Fix in printing the missing DCS DPs.
authorzampolli <zampolli@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 16 Feb 2010 14:51:59 +0000 (14:51 +0000)
committerzampolli <zampolli@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 16 Feb 2010 14:51:59 +0000 (14:51 +0000)
STEER/AliGRPPreprocessor.cxx
STEER/AliGRPPreprocessor.h

index 6748e20..176c406 100644 (file)
@@ -76,6 +76,7 @@ ClassImp(AliGRPPreprocessor)
   const Int_t AliGRPPreprocessor::fgknDCSDP = 48;   // number of dcs dps
   const Int_t AliGRPPreprocessor::fgknDCSDPHallProbes = 40;   // number of dcs dps
   const Int_t AliGRPPreprocessor::fgknLHCDP = 5;   // number of dcs dps from LHC data
+  const Int_t AliGRPPreprocessor::fgkDCSDPHallTopShift = 4;   // shift from the top to get tp the Hall Probes names in the list of DCS DPs
   const char* AliGRPPreprocessor::fgkDCSDataPoints[AliGRPPreprocessor::fgknDCSDP] = {
                    "L3Polarity",
                    "DipolePolarity",
@@ -343,7 +344,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap)
        Log(Form("entries found = %d (should be %d)",entries, fgknDCSDP-1));
        if (fdaqStartEndTimeOk){
                if( entries < fgknDCSDP-1 ) { // FIXME (!= ) L3_BSF4_H3 are not working yet...  
-                       Log(Form("Problem with the DCS data points!!! Only %d/%d entries found",entries,fgknDCSDP-4));
+                       Log(Form("Problem with the DCS data points!!! Only %d/%d entries found",entries,fgknDCSDP-1));
                        Log(Form("The DPs giving problems were:"));
                        for (Int_t iDP = 0; iDP < fgknDCSDP; iDP++){
                                TObjString *dpString = (TObjString*)ffailedDPs->At(iDP);
@@ -1363,7 +1364,7 @@ Int_t AliGRPPreprocessor::ProcessHPDPs(const TMap* valueMap, AliGRPObject* grpOb
                                }
                        }
                        if (!outOfRange) {
-                               ffailedDPs->RemoveAt(indexDP + 7);  // 7 = shift in the complete list of DPs to get to the Hall Probes
+                               ffailedDPs->RemoveAt(indexDP + fgkDCSDPHallTopShift);  // 7 = shift in the complete list of DPs to get to the Hall Probes
                                nHPEntries++;
                        }
                }
index a6dea6d..1db125c 100644 (file)
@@ -49,7 +49,7 @@ class AliGRPPreprocessor: public AliPreprocessor {
                 kCavernAtmosPressure2};
 
        enum DPHallProbes { 
-                khpL3bsf17H1= 0 , khpL3bsf17H2, khpL3bsf17H3, khpL3bsf17Temperature, 
+                khpL3bsf17H1=0, khpL3bsf17H2, khpL3bsf17H3, khpL3bsf17Temperature, 
                 khpL3bsf4H1, khpL3bsf4H2, khpL3bsf4H3, khpL3bsf4Temperature, 
                 khpL3bkf17H1, khpL3bkf17H2, khpL3bkf17H3, khpL3bkf17Temperature, 
                 khpL3bkf4H1, khpL3bkf4H2, khpL3bkf4H3, khpL3bkf4Temperature, 
@@ -113,7 +113,7 @@ class AliGRPPreprocessor: public AliPreprocessor {
   static const Int_t   fgknDCSDP;               //! number of dcs dps
   static const char*   fgkDCSDataPoints[];      //! names of dcs dps
   static const char*   fgkDCSDataPointsHallProbes[];      //! names of dcs dps for Hall Probes
-  static const Int_t   fgknDCSDPHallProbes;           //! names of LHC States for Hall Probes
+  static const Int_t   fgknDCSDPHallProbes;           //! number of Hall Probes
 
   AliDCSSensorArray*   fPressure; //pressure array
 
@@ -134,6 +134,7 @@ class AliGRPPreprocessor: public AliPreprocessor {
 
   static const Int_t   fgknLHCDP;               //! number of lhc dps
   static const char*   fgkLHCDataPoints[];      //! names of lhc dps
+  static const Int_t   fgkDCSDPHallTopShift;    //! shift from the top to the Hall Probes from the list of DCS DPs names
 
   ClassDef(AliGRPPreprocessor, 0);
 };