Removed depricted histograms ... cleanup

[u/mrichter/AliRoot.git] / VZERO / AliVZERODataDCS.cxx

diff --git a/VZERO/AliVZERODataDCS.cxx b/VZERO/AliVZERODataDCS.cxx
index 86eb002280da0b6884dc7fdeec2d1f59595dce1c..17a79f7241a7ba66e7760422e758d0c85f9933f1 100644 (file)
--- a/VZERO/AliVZERODataDCS.cxx
+++ b/VZERO/AliVZERODataDCS.cxx
@@ -58,6 +58,7 @@ AliVZERODataDCS::AliVZERODataDCS():
                fDeadChannel[i] = kFALSE;
                fMeanHV[i]      = 100.0;
                fWidthHV[i]     = 0.0; 
+               fHv[i]          = NULL;
        }
 }
 
@@ -102,9 +103,10 @@ AliVZERODataDCS::~AliVZERODataDCS() {
 }
 
 //_____________________________________________________________________________
-void AliVZERODataDCS::ProcessData(TMap& aliasMap){
+Bool_t AliVZERODataDCS::ProcessData(TMap& aliasMap){
 
   // method to process the data
+  Bool_t success = kTRUE;
 
   if(!(fAliasNames[0])) Init();
 
@@ -117,6 +119,7 @@ void AliVZERODataDCS::ProcessData(TMap& aliasMap){
     aliasArr = (TObjArray*) aliasMap.GetValue(fAliasNames[iAlias].Data());
     if(!aliasArr){
       AliError(Form("Alias %s not found!", fAliasNames[iAlias].Data()));
+      success = kFALSE;
       continue;
     }
 
@@ -139,14 +142,15 @@ void AliVZERODataDCS::ProcessData(TMap& aliasMap){
        Float_t variation = 0.0;
 
        while((aValue = (AliDCSValue*) iterarray.Next())) {
-                       values[iValue] = aValue->GetFloat();
                        UInt_t currentTime = aValue->GetTimeStamp();
+                       if(currentTime>fDaqEndTime) break;
+
+                       values[iValue] = aValue->GetFloat();
                        times[iValue] = (Double_t) (currentTime);
                        
                        if(iValue>0) {
                                if(values[iValue-1]>0.) variation = TMath::Abs(values[iValue]-values[iValue-1])/values[iValue-1];
-                               if(currentTime>fDaqEndTime && variation>0.10) continue;
-                               if(variation > 0.10) fDeadChannel[GetOfflineChannel(iAlias)] = kTRUE;
+                               if(variation > 0.01) fDeadChannel[GetOfflineChannel(iAlias)] = kTRUE;
                        }
                        fHv[iAlias]->Fill(values[iValue]);
                        printf("%s %f Dead=%d\n",fAliasNames[iAlias].Data(),values[iValue],fDeadChannel[GetOfflineChannel(iAlias)]);
@@ -170,6 +174,8 @@ void AliVZERODataDCS::ProcessData(TMap& aliasMap){
   }
   
   fIsProcessed=kTRUE;
+
+  return success;
 }
 
 //_____________________________________________________________________________
@@ -202,6 +208,26 @@ void AliVZERODataDCS::Init(){
                fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/WidthResolution",iCIU);
        }
 
+       // HPTDC parameters
+       for(int iCIU = 0; iCIU<8 ; iCIU++){
+         fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/MatchWindow",iCIU);
+         fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/SearchWindow",iCIU);
+         fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/TriggerCountOffset",iCIU);
+         fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/RollOver",iCIU);
+       }
+
+       for(int iCIU = 0; iCIU<8 ; iCIU++){
+         for(int iCh=1;iCh<=8;iCh++){
+           fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/DelayHit%d",iCIU,iCh);
+         }
+       }
+
+       for(int iCIU = 0; iCIU<8 ; iCIU++){
+         for(int iCh=1;iCh<=8;iCh++){
+           fAliasNames[iAlias++] = Form("V00/FEE/CIU%d/DiscriThr%d",iCIU,iCh);
+         }
+       }
+
   if(iAlias!=kNAliases) 
              AliError(Form("Number of DCS Aliases defined not correct"));