Leak detected by Coverity fixed

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

diff --git a/VZERO/AliVZEROTriggerData.cxx b/VZERO/AliVZEROTriggerData.cxx
index d48d616bbacbeeee3773dc87214e7179cd133d34..73965011f3e7b4757cd7fcec9595c2408229f991 100644 (file)
--- a/VZERO/AliVZEROTriggerData.cxx
+++ b/VZERO/AliVZEROTriggerData.cxx
@@ -62,7 +62,14 @@ AliVZEROTriggerData::AliVZEROTriggerData() :
                fLatchWin1[i] = fLatchWin2[i] = 0;\r
                fResetWin1[i] = fResetWin2[i] = 0;\r
                fPedestalSubtraction[i] = kFALSE;\r
+               for(Int_t j = 0; j < kNChannels; ++j) {\r
+                 fEnableCharge[i][j] = fEnableTiming[i][j] = kFALSE;\r
+                 fDiscriThr[i][j] = fDelayHit[i][j] = 0;\r
+                 fPedestalOdd[i][j] = fPedestalEven[i][j] = 0;\r
+                 fPedestalCutOdd[i][j] = fPedestalCutEven[i][j] = 0;\r
+               }\r
        }\r
+       for(Int_t i = 0; i < kNTriggerOutputs; ++i) fTriggerSelected[i] = 0;\r
 }\r
 //________________________________________________________________\r
 AliVZEROTriggerData::AliVZEROTriggerData(Int_t nRun, UInt_t startTime, UInt_t endTime) :\r
@@ -95,7 +102,15 @@ AliVZEROTriggerData::AliVZEROTriggerData(Int_t nRun, UInt_t startTime, UInt_t en
                fLatchWin1[i] = fLatchWin2[i] = 0;\r
                fResetWin1[i] = fResetWin2[i] = 0;\r
                fPedestalSubtraction[i] = kFALSE;\r
+               for(Int_t j = 0; j < kNChannels; ++j) {\r
+                 fEnableCharge[i][j] = fEnableTiming[i][j] = kFALSE;\r
+                 fDiscriThr[i][j] = fDelayHit[i][j] = 0;\r
+                 fPedestalOdd[i][j] = fPedestalEven[i][j] = 0;\r
+                 fPedestalCutOdd[i][j] = fPedestalCutEven[i][j] = 0;\r
+               }\r
        }\r
+       for(Int_t i = 0; i < kNTriggerOutputs; ++i) fTriggerSelected[i] = 0;\r
+\r
        TString namst = "VZERO_Trigger_FEE";\r
        SetName(namst.Data());\r
        SetTitle(namst.Data());\r
@@ -115,17 +130,17 @@ void AliVZEROTriggerData::FillData(AliVZERODataFEE * data){
        \r
        while ((  aliasName = (TObjString*) iter.Next() ))  {\r
                AliDCSValue* aValue = (AliDCSValue*) params->GetValue(aliasName);\r
-               Float_t val;\r
+               Int_t val;\r
                if(aValue) {\r
-                       val = aValue->GetFloat();\r
-                       AliInfo(Form("%s : %f",aliasName->String().Data(), val));\r
+                       val = aValue->GetUInt();\r
+                       AliInfo(Form("%s : %d",aliasName->String().Data(), val));\r
                        SetParameter(aliasName->String(),val);\r
                }\r
        }       \r
 }\r
 \r
 //_____________________________________________________________________________\r
-void AliVZEROTriggerData::SetParameter(TString name, Float_t val){\r
+void AliVZEROTriggerData::SetParameter(TString name, Int_t val){\r
        // Set given parameter\r
        \r
        Int_t iBoard = -1;\r
@@ -167,7 +182,7 @@ void AliVZEROTriggerData::SetParameter(TString name, Float_t val){
        else if(name.Contains("MultV0AThrHigh")) SetMultV0AThrHigh((UShort_t) val);\r
        else if(name.Contains("MultV0CThrLow")) SetMultV0CThrLow((UShort_t) val);\r
        else if(name.Contains("MultV0CThrHigh")) SetMultV0CThrHigh((UShort_t) val);\r
-       else if(name.Contains("TriggerSelect")) SetTriggerSelected((UShort_t) val, iBoard );\r
+       else if(name.Contains("TriggerSelect")) SetTriggerSelected((UShort_t) val, iChannel-1 );\r
        else if(name.Contains("EnableCharge")) SetEnableCharge((Bool_t) val, iBoard , iChannel-1);\r
        else if(name.Contains("EnableTiming")) SetEnableTiming((Bool_t) val, iBoard , iChannel-1);\r
        else if(name.Contains("DiscriThr")) SetDiscriThr((UShort_t) val, iBoard, iChannel-1);\r