Coding convetion violations fixed.

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

diff --git a/VZERO/AliVZERODataDCS.cxx b/VZERO/AliVZERODataDCS.cxx
index 44f20afd78a75e86dc9651e146a0812d2e3b7e6c..6dd5277353462a0722699970bf24953af35bffe3 100644 (file)
--- a/VZERO/AliVZERODataDCS.cxx
+++ b/VZERO/AliVZERODataDCS.cxx
@@ -46,6 +46,8 @@ AliVZERODataDCS::AliVZERODataDCS():
        fRun(0),
        fStartTime(0),
        fEndTime(0),
+       fDaqStartTime(0),
+       fDaqEndTime(0),
     fGraphs("TGraph",kNGraphs),
        fFEEParameters(NULL),
        fIsProcessed(kFALSE)
@@ -56,15 +58,18 @@ AliVZERODataDCS::AliVZERODataDCS():
                fDeadChannel[i] = kFALSE;
                fMeanHV[i]      = 100.0;
                fWidthHV[i]     = 0.0; 
+               fHv[i]          = NULL;
        }
 }
 
 //_____________________________________________________________________________
-AliVZERODataDCS::AliVZERODataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime):
+AliVZERODataDCS::AliVZERODataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime, UInt_t daqStartTime, UInt_t daqEndTime):
        TObject(),
        fRun(nRun),
        fStartTime(startTime),
        fEndTime(endTime),
+       fDaqStartTime(daqStartTime),
+       fDaqEndTime(daqEndTime),
        fGraphs("TGraph",kNGraphs),
        fFEEParameters(new TMap()),
        fIsProcessed(kFALSE)
@@ -77,9 +82,11 @@ AliVZERODataDCS::AliVZERODataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime):
         fMeanHV[i]      = 100.0;
      fWidthHV[i]     = 0.0; 
        }
-       AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", nRun,
+       AliInfo(Form("\n\tRun %d \n\tTime Created %s \n\tTime Completed %s \n\tDAQ start %s \n\tDAQ end %s  ", nRun,
                TTimeStamp(startTime).AsString(),
-               TTimeStamp(endTime).AsString()));
+               TTimeStamp(endTime).AsString(),
+               TTimeStamp(daqStartTime).AsString(),
+               TTimeStamp(daqEndTime).AsString()));
        
        fFEEParameters->SetOwnerValue();
        Init();
@@ -134,11 +141,14 @@ void AliVZERODataDCS::ProcessData(TMap& aliasMap){
 
        while((aValue = (AliDCSValue*) iterarray.Next())) {
                        values[iValue] = aValue->GetFloat();
+                       UInt_t currentTime = aValue->GetTimeStamp();
+                       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;
                        }
-                       times[iValue] = (Double_t) (aValue->GetTimeStamp());
                        fHv[iAlias]->Fill(values[iValue]);
                        printf("%s %f Dead=%d\n",fAliasNames[iAlias].Data(),values[iValue],fDeadChannel[GetOfflineChannel(iAlias)]);
                        iValue++;
@@ -193,6 +203,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"));