Index corrected in AliZDCReconstructor.cxx + getting rid of unused calib object in...

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

diff --git a/VZERO/AliVZEROTriggerSimulator.cxx b/VZERO/AliVZEROTriggerSimulator.cxx
index 015ea5bbe19efe0bc6308a3df4ba8f8fba3c18fd..878727fccc15462e39270b97d3092c2ec8bc64d1 100644 (file)
--- a/VZERO/AliVZEROTriggerSimulator.cxx
+++ b/VZERO/AliVZEROTriggerSimulator.cxx
@@ -44,7 +44,7 @@ TObject(),fTriggerData(NULL),fDigitsTree(digitsTree),fDigits(digits),fTriggerWor
        \r
        for(int i=0;i<64;i++) {\r
                fBBFlags[i] = fBGFlags[i] = kFALSE;\r
-               fCharges[i] = 0;\r
+               fCharges[i] = 0.;\r
        }\r
        GenerateBBWindows();\r
        GenerateBGWindows();\r
@@ -159,17 +159,17 @@ void AliVZEROTriggerSimulator::Run() {
                        if(fTriggerData->GetEnableCharge(board,channel)) {\r
                                fCharges[pmNumber] = digit->ADC();\r
                                if(fTriggerData->GetPedestalSubtraction(board)) {\r
-                                       if(fCharges[pmNumber]>=fTriggerData->GetPedestalCut(integrator,board,channel)){ \r
-                                               fCharges[pmNumber] -= fTriggerData->GetPedestal(integrator,board,channel);\r
+                                       if(fCharges[pmNumber]>=(Float_t) fTriggerData->GetPedestalCut(integrator,board,channel)){ \r
+                                               fCharges[pmNumber] -= (Float_t) fTriggerData->GetPedestal(integrator,board,channel);\r
                                        } else {\r
-                                               fCharges[pmNumber] = 0;\r
+                                               fCharges[pmNumber] = 0.;\r
                                        }\r
                                }\r
                        } else {\r
-                               fCharges[pmNumber] = 0;\r
+                               fCharges[pmNumber] = 0.;\r
                        }\r
                        \r
-                       Float_t time = (Float_t)digit->Time() / 10.; // digit->Time() in bin of 100 picoseconds. Divide by 10 to have it in nanoseconds\r
+                       Float_t time = digit->Time(); \r
                        time += fTriggerData->GetDelayHit(board,channel);\r
                        \r
                        //AliInfo(Form(" PM nb : %d ; ADC= %d ; TDC= %f  Enable Time %d charge %d",pmNumber,digit->ADC(),time,fTriggerData->GetEnableTiming(board,channel),fTriggerData->GetEnableCharge(board,channel)));\r
@@ -183,8 +183,8 @@ void AliVZEROTriggerSimulator::Run() {
        Int_t nBBflagsV0C = 0;\r
        Int_t nBGflagsV0A = 0;\r
        Int_t nBGflagsV0C = 0;\r
-       Int_t chargeV0A   = 0;\r
-       Int_t chargeV0C   = 0;\r
+       Float_t chargeV0A   = 0.;\r
+       Float_t chargeV0C   = 0.;\r
 \r
        for(int i=0;i<64;i++) {\r
                if(i<32) {\r