coverity fixes

diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx
index 2a1db243a98ad016d6c567981daa7d4b504b584b..73209002498a137b178e5f359c7be1983c71c3cd 100644 (file)
--- a/ZDC/AliZDCDigitizer.cxx
+++ b/ZDC/AliZDCDigitizer.cxx
@@ -476,7 +476,7 @@ void AliZDCDigitizer::ReadPMTGains()
   }
   fclose(fdata);
   
-  if(((fBeamType.CompareTo("P-P")) == 0)){
+  if(((fBeamType.CompareTo("P-P")) == 0) || ((fBeamType.CompareTo("p-p")) == 0)){
     for(int i=0; i<12; i++){
       if(beam[i]==0 && fBeamEnergy!=0.){
         if(det[i]!=31 && det[i]!=32){

diff --git a/ZDC/AliZDCReconstructor.cxx b/ZDC/AliZDCReconstructor.cxx
index 336dce61f504caa8737832bf088a8f93205ea143..6ae77a6bf3b69bb8d6c47c585c246fafecc92dcc 100644 (file)
--- a/ZDC/AliZDCReconstructor.cxx
+++ b/ZDC/AliZDCReconstructor.cxx
@@ -830,12 +830,11 @@ void AliZDCReconstructor::ReconstructEventpp(TTree *clustersTree,
      calibTowZP2[gi+5] = equalTowZP2[gi+5]*calibEne[3];
   }
   //
-  Float_t sumZEM[]={0,0}, calibZEM1[]={0,0}, calibZEM2[]={0,0};
+  Float_t calibZEM1[]={0,0}, calibZEM2[]={0,0};
   calibZEM1[0] = corrADCZEM1[0]*calibEne[4];
   calibZEM1[1] = corrADCZEM1[1]*calibEne[4];
   calibZEM2[0] = corrADCZEM2[0]*calibEne[5];
   calibZEM2[1] = corrADCZEM2[1]*calibEne[5];
-  for(Int_t k=0; k<2; k++) sumZEM[k] = calibZEM1[k] + calibZEM2[k];
   // Ch. debug
   /*printf("\n ------------- CALIBRATION -------------\n");
   printf(" ADCZN1 [%1.2f %1.2f %1.2f %1.2f %1.2f]\n",
@@ -1032,12 +1031,11 @@ void AliZDCReconstructor::ReconstructEventPbPb(TTree *clustersTree,
   calibSumZN2[1] = calibSumZN2[1]*calibEne[2];
   calibSumZP2[1] = calibSumZP2[1]*calibEne[3];
   //
-  Float_t sumZEM[]={0,0}, calibZEM1[]={0,0}, calibZEM2[]={0,0};
+  Float_t calibZEM1[]={0,0}, calibZEM2[]={0,0};
   calibZEM1[0] = corrADCZEM1[0]*calibEne[4];
   calibZEM1[1] = corrADCZEM1[1]*calibEne[4];
   calibZEM2[0] = corrADCZEM2[0]*calibEne[5];
   calibZEM2[1] = corrADCZEM2[1]*calibEne[5];
-  for(Int_t k=0; k<2; k++) sumZEM[k] = calibZEM1[k] + calibZEM2[k];
     
   // ******    Energy calibration of detector responses
   Float_t calibTowZN1[10], calibTowZN2[10], calibTowZP1[10], calibTowZP2[10];

diff --git a/ZDC/AliZDCTriggerProcessor.cxx b/ZDC/AliZDCTriggerProcessor.cxx
index 79705634dc5240e6aed871075d6c673bc1052463..4feb2c9bfb244a6d61466a1fb995758ed91ea551 100644 (file)
--- a/ZDC/AliZDCTriggerProcessor.cxx
+++ b/ZDC/AliZDCTriggerProcessor.cxx
@@ -80,7 +80,7 @@ UInt_t AliZDCTriggerProcessor::ProcessEvent()
   
   if((mbTriggered == kTRUE) || (cenTriggered == kTRUE) || 
      (semicenTriggered == kTRUE) || (emdTriggered == kTRUE)){
-      return 1;
+      return ctpInput;
   }
   else{
     return 0;

diff --git a/ZDC/AliZDCv4.cxx b/ZDC/AliZDCv4.cxx
index 70c5ce3f614e67f66604d972e10b22a48007b87a..1ba39c34fc6448d41bdd15e911d0391a100c778d 100644 (file)
--- a/ZDC/AliZDCv4.cxx
+++ b/ZDC/AliZDCv4.cxx
@@ -2312,7 +2312,7 @@ void AliZDCv4::StepManager()
       //printf("\t Particle: mass = %1.3f, E = %1.3f GeV, pz = %1.2f GeV -> stopped in volume %s\n", 
       //     TVirtualMC::GetMC()->TrackMass(), p[3], p[2], TVirtualMC::GetMC()->CurrentVolName());
       //
-      /*if(ipr!=0){
+      if(ipr<0){
         printf("\n\t **********************************\n");
         printf("\t ********** Side C **********\n");
         printf("\t # of particles in IT = %d\n",fpLostITC);
@@ -2324,7 +2324,7 @@ void AliZDCv4::StepManager()
         printf("\t # of particles in TDI = %d\n",fpLostTDI);
         printf("\t # of particles in VColl = %d\n",fpcVCollA);
         printf("\t **********************************\n");
-      }*/
+      }
       TVirtualMC::GetMC()->StopTrack();
       return;
   }