Previous commit had the bad side-effect of changing the behaviour of Raw QA to comput...

[u/mrichter/AliRoot.git] / ZDC / AliZDCDataDCS.cxx

diff --git a/ZDC/AliZDCDataDCS.cxx b/ZDC/AliZDCDataDCS.cxx
index af1611511614793bec3981b96cf822179bfc461a..4a22274b1e50d8b9f716d617ecda248d36e6ff35 100644 (file)
--- a/ZDC/AliZDCDataDCS.cxx
+++ b/ZDC/AliZDCDataDCS.cxx
@@ -43,7 +43,7 @@ AliZDCDataDCS::AliZDCDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime):
 {
    // Standard constructor
    
-   AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", nRun,
+   AliDebug(2,Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", nRun,
    TTimeStamp(startTime).AsString(),
    TTimeStamp(endTime).AsString()));
 
@@ -59,7 +59,7 @@ AliZDCDataDCS::~AliZDCDataDCS()
 }
 
 //---------------------------------------------------------------
-void AliZDCDataDCS::ProcessData(TMap& aliasMap, Float_t *fCalibData)
+void AliZDCDataDCS::ProcessData(TMap& aliasMap)
 {
    // Data processing
    
@@ -68,13 +68,13 @@ void AliZDCDataDCS::ProcessData(TMap& aliasMap, Float_t *fCalibData)
    for(int j=0; j<kNAliases; j++){
       aliasArr = (TObjArray*) aliasMap.GetValue(fAliasNames[j].Data());
       if(!aliasArr){
-       AliError(Form("Alias %s not found!", fAliasNames[j].Data()));
+       AliWarning(Form("Alias %s not found!", fAliasNames[j].Data()));
        continue;
       }
       Introduce(j, aliasArr);
 
-      if(aliasArr->GetEntries()<2){
-       AliError(Form("Alias %s has just %d entries!",
+      if(aliasArr->GetEntries()<=2){
+       AliWarning(Form("Alias %s has just %d entries!",
                        fAliasNames[j].Data(),aliasArr->GetEntries()));
        continue;
       }
@@ -89,12 +89,11 @@ void AliZDCDataDCS::ProcessData(TMap& aliasMap, Float_t *fCalibData)
        val[ne] = aValue->GetFloat();
        time[ne] = (Double_t) (aValue->GetTimeStamp());
        fCalibData[ne] = val[ne];
+       fTimeStamp[ne] = time[ne];
        ne++;
       }
-      //
       
-      //
-      if(j>=4) CreateGraph(j, aliasArr->GetEntries(), time, val); // fill graphs 
+//      if(j>=4) CreateGraph(j, aliasArr->GetEntries(), time, val); // fill graphs 
       //
       delete[] val;
       delete[] time;         
@@ -113,17 +112,41 @@ void AliZDCDataDCS::Init()
 
    fGraphs.SetOwner(1);
 
-   for(int i=0;i<kNAliases;i++){
-          if(i<4){
-            fAliasNames[i] = "ZDC.Position";
-            fAliasNames[i] += i;
-          }
-          else{
-            fAliasNames[i] = "ZDC.HVValue";
-            fAliasNames[i] += i-4;
-          }
-   }
-
+   fAliasNames[0] = "ZDC_ZNA_POS.actual.position";
+   fAliasNames[1] = "ZDC_ZPA_POS.actual.position";
+   fAliasNames[2] = "ZDC_ZNC_POS.actual.position";
+   fAliasNames[3] = "ZDC_ZPC_POS.actual.position";
+   //
+   fAliasNames[4]  = "ZDC_ZNA_HV0.actual.vMon";
+   fAliasNames[5]  = "ZDC_ZNA_HV1.actual.vMon";
+   fAliasNames[6]  = "ZDC_ZNA_HV2.actual.vMon";
+   fAliasNames[7]  = "ZDC_ZNA_HV3.actual.vMon";
+   fAliasNames[8]  = "ZDC_ZNA_HV4.actual.vMon";
+   //
+   fAliasNames[9]   = "ZDC_ZPA_HV0.actual.vMon";
+   fAliasNames[10]  = "ZDC_ZPA_HV1.actual.vMon";
+   fAliasNames[11]  = "ZDC_ZPA_HV2.actual.vMon";
+   fAliasNames[12]  = "ZDC_ZPA_HV3.actual.vMon";
+   fAliasNames[13]  = "ZDC_ZPA_HV4.actual.vMon";
+   //
+   fAliasNames[14]  = "ZDC_ZNC_HV0.actual.vMon";
+   fAliasNames[15]  = "ZDC_ZNC_HV1.actual.vMon";
+   fAliasNames[16]  = "ZDC_ZNC_HV2.actual.vMon";
+   fAliasNames[17]  = "ZDC_ZNC_HV3.actual.vMon";
+   fAliasNames[18]  = "ZDC_ZNC_HV4.actual.vMon";
+   //
+   fAliasNames[19]  = "ZDC_ZPC_HV0.actual.vMon";
+   fAliasNames[20]  = "ZDC_ZPC_HV1.actual.vMon";
+   fAliasNames[21]  = "ZDC_ZPC_HV2.actual.vMon";
+   fAliasNames[22]  = "ZDC_ZPC_HV3.actual.vMon";
+   fAliasNames[23]  = "ZDC_ZPC_HV4.actual.vMon";
+   //
+   fAliasNames[24]  = "ZDC_ZEM_HV0.actual.vMon";
+   fAliasNames[25]  = "ZDC_ZEM_HV1.actual.vMon";
+   //
+   fAliasNames[26]  = "ZDC_REFA_HV.actual.vMon";
+   fAliasNames[27]  = "ZDC_REFC_HV.actual.vMon";
+ 
 }
 
 //---------------------------------------------------------------
@@ -131,9 +154,9 @@ void AliZDCDataDCS::Introduce(UInt_t numAlias, const TObjArray* aliasArr)
 {
    // Getting array of DCS aliases
    
-   int entries=aliasArr->GetEntries();
-   AliInfo(Form("************ Alias: %s **********",fAliasNames[numAlias].Data()));
-   AliInfo(Form("         %d DP values collected",entries));
+   int entries = aliasArr->GetEntries();
+   AliDebug(2,Form("************ Alias: %s **********",fAliasNames[numAlias].Data()));
+   AliDebug(2,Form("      %d DP values collected",entries));
 
 }
 
@@ -148,8 +171,7 @@ void AliZDCDataDCS::CreateGraph(int i, int dim, const Double_t *x, const Double_
 
    gr->GetXaxis()->SetTimeDisplay(1);
    gr->SetTitle(fAliasNames[i].Data());
-
-   AliInfo(Form("Array entries: %d",fGraphs.GetEntriesFast()));
+//   AliDebug(2,Form("Array entries: %d",fGraphs.GetEntriesFast()));
 
 
 }