]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Coverity fixes
authormasera <massimo.masera@cern.ch>
Fri, 20 Jun 2014 17:07:21 +0000 (19:07 +0200)
committermasera <massimo.masera@cern.ch>
Fri, 20 Jun 2014 17:07:42 +0000 (19:07 +0200)
ITS/AliITSClusterFinderV2SSD.cxx
ITS/AliITSDDLRawData.cxx
ITS/AliITSMultReconstructor.cxx
ITS/AliITSQASDDDataMakerRec.cxx
ITS/AliITSQASPDDataMakerRec.cxx
ITS/AliITSRealignTracks.cxx
ITS/AliITSTPArrayFit.cxx
ITS/AliITSTrackleterSPDEff.cxx
ITS/AliITSVertexer.cxx
ITS/AliITSv11GeometrySDD.cxx
ITS/AliITSv11GeometrySSD.cxx

index 9c4c91c8edc7b7d5645dbdc193358cda796636b2..2d8c9716bb51d8bbde86b8b411ca1a6211d08099 100644 (file)
@@ -185,11 +185,11 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   cout<<"this is module "<<fModule;
   cout<<endl;
   cout<<endl;
-  */
   Int_t layer = 4;
   if (fModule>fLastSSD1) 
     layer = 5;
-
+  */
   //--------------------------------------------------------
   // start 1D-clustering from the first digit in the digits array
   //
@@ -510,9 +510,10 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input)
          continue;
        }
        
-       Int_t layer = 4;
+       /*      Int_t layer = 4;
        if (fModule>fLastSSD1) 
          layer = 5;
+       */
 
        AliITSCalibrationSSD* cal = (AliITSCalibrationSSD*)fDetTypeRec->GetCalibrationModel(fModule);
        if( !cal ){
@@ -1298,7 +1299,7 @@ FindClustersSSD(const Ali1Dcluster* neg, Int_t nn,
       //
       if ( (cnegative[ip]==2) && cpositive[negativepair[10*ip]]==2){ 
        Float_t minchargediff =4.;
-       Float_t minchargeratio =0.2;
+       //      Float_t minchargeratio =0.2;
 
        Int_t j=-1;
        for (Int_t di=0;di<cnegative[ip];di++){
@@ -1309,7 +1310,7 @@ FindClustersSSD(const Ali1Dcluster* neg, Int_t nn,
          if (TMath::Abs(ratio)<0.2){
            j =jc;
            minchargediff = TMath::Abs(chargedif);
-           minchargeratio = TMath::Abs(ratio);
+           //      minchargeratio = TMath::Abs(ratio);
          }
        }
        if (j<0) continue;  // not proper cluster      
index 1d3eac594f0de0e090241fb65a0f735c331954c3..a0ba53ead55bc81492bb327d6cc75945f643d178 100644 (file)
@@ -658,6 +658,7 @@ Int_t AliITSDDLRawData::RawDataSDD(TBranch* branch, const AliITSDDLModuleMapSDD*
   UInt_t jitterWord=0;
   Bool_t retcode;
   retcode = AliBitPacking::PackWord(0x3FFFFFFF,carlosFooterWord,0,31);
+  if(!retcode)AliError("AliBitPacking error\n");
   retcode = AliBitPacking::PackWord(0x3F1F1F1F,fifoFooterWord,0,31);
   if(fSDDRawFormat!=0) retcode = AliBitPacking::PackWord(0x7F000000,jitterWord,0,31);
   else retcode = AliBitPacking::PackWord(0x80000000,jitterWord,0,31);
index a1881bb9c964c5845587c8acf71675531aaa207f..8961c32d02b62820693d228855035c85666d6ee0 100644 (file)
@@ -813,8 +813,6 @@ void AliITSMultReconstructor::FlagClustersInOverlapRegions (Int_t iC1, Int_t iC2
 {
   // Flags clusters in the overlapping regions
   Float_t distClSameMod=0.;
-  Float_t distClSameModMin=0.;
-  Int_t   iClOverlap =0;
   Float_t meanRadiusLay1 = 3.99335; // average radius inner layer
   Float_t meanRadiusLay2 = 7.37935; // average radius outer layer;
 
@@ -841,23 +839,12 @@ void AliITSMultReconstructor::FlagClustersInOverlapRegions (Int_t iC1, Int_t iC2
         distClSameMod = TMath::Sqrt(TMath::Power(deZproj/fZetaOverlapCut,2)+TMath::Power(dePhi/fPhiOverlapCut,2));
         if (distClSameMod<=1.) fOverlapFlagClustersLay[0][iiC1]=kTRUE;
 
-//        if (distClSameMod<=1.) {
-//          if (distClSameModMin==0. || distClSameMod<distClSameModMin) {
-//            distClSameModMin=distClSameMod;
-//            iClOverlap=iiC1;
-//          } 
-//        }
-
-
       } // end adjacent modules
     } 
   } // end Loop on inner layer clusters
 
-//  if (distClSameModMin!=0.) fOverlapFlagClustersLay[0][iClOverlap]=kTRUE;
 
   distClSameMod=0.;
-  distClSameModMin=0.;
-  iClOverlap =0;
   // Loop on outer layer clusters
   for (Int_t iiC2=0; iiC2<fNClustersLay[1]; iiC2++) {
     if (!fOverlapFlagClustersLay[1][iiC2]) {
@@ -875,19 +862,10 @@ void AliITSMultReconstructor::FlagClustersInOverlapRegions (Int_t iC1, Int_t iC2
         distClSameMod = TMath::Sqrt(TMath::Power(deZproj/fZetaOverlapCut,2)+TMath::Power(dePhi/fPhiOverlapCut,2));
         if (distClSameMod<=1.) fOverlapFlagClustersLay[1][iiC2]=kTRUE;
 
-//        if (distClSameMod<=1.) {
-//          if (distClSameModMin==0. || distClSameMod<distClSameModMin) {
-//            distClSameModMin=distClSameMod;
-//            iClOverlap=iiC2;
-//          }
-//        }
-
       } // end adjacent modules
     }
   } // end Loop on outer layer clusters
 
-//  if (distClSameModMin!=0.) fOverlapFlagClustersLay[1][iClOverlap]=kTRUE;
-
 }
 
 //____________________________________________________________________
index f4083c4418a68058c9ec919d9b6c1e62c4806645..089544d248df8de9a37d0e02fb724a61d62e377f 100644 (file)
@@ -416,7 +416,7 @@ Int_t AliITSQASDDDataMakerRec::InitRaws()
 
   Int_t rv = 0 ; 
   Int_t lay, lad, det;
-  Int_t indexlast = 0;
+
   Int_t index1 = 0;
   int offsRW = fGenRawsOffset[fAliITSQADataMakerRec->GetEventSpecie()];
   fSDDhRawsTask = 0;
@@ -615,10 +615,10 @@ Int_t AliITSQASDDDataMakerRec::InitRaws()
     hddl->GetYaxis()->SetTitle("DDL Number");
     rv = fAliITSQADataMakerRec->Add2RawsList(hddl,fOnlineOffsetRaws+offsRW, expert, !image, !saveCorr);
     fSDDhRawsTask++;
-    Int_t indexlast1 = 0;
-    
+
+    Int_t  indexlast1 = 0;
     fTimeBinSize = 4;
-    indexlast = 0;
+
     index1 = 0;
     indexlast1 = fSDDhRawsTask;
     for(Int_t moduleSDD =0; moduleSDD<fgknSDDmodules; moduleSDD++){
@@ -692,7 +692,6 @@ Int_t AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
   }
   
   Int_t cnt = 0;
-  Int_t ildcID = -1;
   Int_t iddl = -1;
   Int_t isddmod = -1;
   Int_t coord1, coord2, signal, moduleSDD, activeModule, index1; 
@@ -705,7 +704,6 @@ Int_t AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
       for(Int_t jddl=0;jddl<totalddl;jddl++){ddldata[jddl]=kFALSE;}
       //}
   while(stream->Next()) {
-    ildcID = rawReader->GetLDCId();
     iddl = rawReader->GetDDLID();// - fgkDDLIDshift;
     if(iddl<0)isddmod=-1;
     //printf("----------------------iddl %i\n",iddl);
index 5afe76defd3e5d99fe508c8f6778da8f21a73da8..933e0302b40190a6cabbcb52aba1e4934d66eacb 100644 (file)
@@ -481,8 +481,8 @@ Int_t AliITSQASPDDataMakerRec::MakeRaws(AliRawReader* rawReader)
   Int_t chipKey;
   Int_t col, row; 
   UInt_t module, colM, rowM;
-  Bool_t isFiredChip[1200];
-  for(Int_t ichK=0; ichK<1200; ichK++) isFiredChip[ichK] = kFALSE;
+  //  Bool_t isFiredChip[1200];
+  //  for(Int_t ichK=0; ichK<1200; ichK++) isFiredChip[ichK] = kFALSE;
   Bool_t isOnlineFiredChip[1200];
   for(Int_t iOnlineKey=0; iOnlineKey<1200; iOnlineKey++) isOnlineFiredChip[iOnlineKey] = kFALSE;
   UInt_t nFastOr[2]={0,0};
@@ -497,7 +497,7 @@ Int_t AliITSQASPDDataMakerRec::MakeRaws(AliRawReader* rawReader)
       row   = rawStreamSPD.GetChipRow();
       isOnlineFiredChip[iEq*60+iHalfStave*10+iChip] = kTRUE;
       chipKey = rawStreamSPD.GetOfflineChipKeyFromOnline(iEq,iHalfStave,iChip);
-      isFiredChip[chipKey] = kTRUE;
+      //      isFiredChip[chipKey] = kTRUE;
 
       rawStreamSPD.OnlineToOffline(iEq, iHalfStave, iChip, col, row, module, colM, rowM);
 
index 8fd352dca98bb48237b4117695d5b2bc0dcdd536..ae72f00de9e00b0091db3c20df19563f5883957b 100644 (file)
@@ -896,14 +896,14 @@ Bool_t AliITSRealignTracks::FirstAlignmentLayers(const Bool_t *layers,Int_t minN
 
   sequence->Set(nMod);
 
Int_t ilayer,imod;
 // Int_t imod;
   for(Int_t iter=0;iter<iterations;iter++){
     if(iter>0&&fDraw)UpdateDraw(sequence,iter,iter);
     modAligned=0;
     for(Int_t k=0;k<nMod;k++){
       TArrayI *volFit3;
       voluid=sequence->At(k);
-      ilayer=AliGeomManager::VolUIDToLayer(voluid,imod);
+      //      ilayer=AliGeomManager::VolUIDToLayer(voluid,imod);
       volIn->AddAt(voluid,0);
       found=0;
       if(!fitall){
@@ -1006,13 +1006,12 @@ Bool_t AliITSRealignTracks::FirstAlignmentSPD(Int_t minNtracks,Int_t iterations,
   }
   sequence->Set(nMod);
   
-  Int_t ilayer,imod;
   for(Int_t iter=0;iter<iterations;iter++){ 
     modAligned=0;
     for(Int_t k=0;k<nMod;k++){
       TArrayI *volFit3;
       voluid=sequence->At(k);
-      ilayer=AliGeomManager::VolUIDToLayer(voluid,imod);
+      //      ilayer=AliGeomManager::VolUIDToLayer(voluid,imod);
       volIn->AddAt(voluid,0);
       found=0;
       if(!fitall){
@@ -1112,7 +1111,7 @@ Bool_t AliITSRealignTracks::AlignVolumesITS(const TArrayI *volids, const TArrayI
   Double_t frac;
 
   TGeoHMatrix hM;
-  Double_t phiglob,smearing,rotorig[9],normplanevect[3]={0.,0.,0.},normplanevect2[3]={0.,0.,0.};  
+  Double_t smearing,rotorig[9],normplanevect[3]={0.,0.,0.},normplanevect2[3]={0.,0.,0.};  
   Double_t *deltarot;
   TMatrixDSym covmatrx(6);
   AliAlignObj *modAlign;
@@ -1160,7 +1159,7 @@ Bool_t AliITSRealignTracks::AlignVolumesITS(const TArrayI *volids, const TArrayI
          normplanevect[2]=0.;
     }
     
-    phiglob=TMath::ATan2(normplanevect[1],normplanevect[0]);
+    //    phiglob=TMath::ATan2(normplanevect[1],normplanevect[0]);
     
     modAlign=GetAlignObj(volids->At(0));
     modAlign->GetMatrix(hM);
@@ -1749,7 +1748,7 @@ AliAlignObjParams* AliITSRealignTracks::MediateAlignObj(const TArrayI *volIDs,In
   // defined by the array volIDs up to lastVolid position in this array
   //The aim of such a method is to look for collective movement of a given set of modules
 
-  UShort_t volid;
+  //  UShort_t volid;
 
   TGeoHMatrix hm;
   Double_t *rot,*transl;
@@ -1758,7 +1757,7 @@ AliAlignObjParams* AliITSRealignTracks::MediateAlignObj(const TArrayI *volIDs,In
 
 
   for(Int_t ivol=0;ivol<lastVolid;ivol++){
-    volid=volIDs->At(ivol);
+    //    volid=volIDs->At(ivol);
   
     GetAlignObj(volIDs->At(ivol))->GetMatrix(hm); 
    
index 94b2d4019be9c4d62581a4c437819543d70673c6..9f40b2b47c604b0fe9f86596a200d2f0cf07ae89 100644 (file)
@@ -1199,7 +1199,7 @@ Bool_t AliITSTPArrayFit::FitHelixCrude(Int_t extQ)
     Double_t normS[3];
     //
     // Positive t-params: along the track direction for negative track, against for positive
-    Double_t pcur = ptot, ecurr = etot;
+    //   Double_t pcur = ptot, ecurr = etot;
     for (int ip=fFirstPosT;ip<fNElsPnt;ip++) {
       int tID = fElsId[ip];
       Double_t t = fCurT[ tID ];
@@ -1216,8 +1216,8 @@ Bool_t AliITSTPArrayFit::FitHelixCrude(Int_t extQ)
     }
     //
     // negaive t-params: against the track direction for negative track, along for positive
-    pcur  = ptot;
-    ecurr = etot;
+    //    pcur  = ptot;
+    //    ecurr = etot;
     for (int ip=fFirstPosT;ip--;) {
       int tID = fElsId[ip];
       Double_t t = fCurT[ tID ];
index 0bfccd0cbf006a2258d0fba88bef3ca4b6df78cc..7b54ceb5a6d344917e3ccce99e17bf27098b7d1e 100644 (file)
@@ -1095,13 +1095,13 @@ TParticle* part = stack->Particle(ipart);
 
   Int_t nret=0;
   TParticle* dau = 0;
-  Int_t nDau = 0;
+  //  Int_t nDau = 0;
   Int_t pdgDau;
   Int_t firstDau = part->GetFirstDaughter(); // if no daugther stored then no way to understand i
                                              // its real fate ! But you have to take it !
   if (firstDau > 0) { // if it has daugther(s) try to infer if it is "detectable" as a tracklet
     Int_t lastDau = part->GetLastDaughter();
-    nDau = lastDau - firstDau + 1;
+    //    nDau = lastDau - firstDau + 1;
     Double_t distMax=0.;
     Int_t jmax=0;
     for(Int_t j=firstDau; j<=lastDau; j++)  {
index 6ecff35c54fe813a2a63e2ebb5f23b8d8417f4f0..be766592b2f2a35ecf10e52a2e4eca1cbc621461 100644 (file)
@@ -226,8 +226,8 @@ void AliITSVertexer::WriteCurrentVertex(){
   fCurrentVertex->SetName("Vertex");
   //  const char * name = fCurrentVertex->GetName();
   //  itsLoader->SetVerticesContName(name);
-  Int_t rc = itsLoader->PostVertex(fCurrentVertex);
-  rc = itsLoader->WriteVertices();
+  itsLoader->PostVertex(fCurrentVertex);
+  itsLoader->WriteVertices();
 }
 
 //______________________________________________________________________
index 31644bbed1e2a234c0e44472809e9b6aa2af3c98..f0a601053bd8eff20fc4d9cb1ddb3b2604b97c6c 100755 (executable)
@@ -1913,7 +1913,7 @@ TGeoVolumeAssembly *AliITSv11GeometrySDD::CreateLadder(Int_t iLay) {
     cableHV[iSegment].SetInitialNode(virtualLadder);
   };
   Double_t x1[3], x2[3], x3[3],
-          vY[3] = {0,1,0}, vZ[3] = {0,0,1}, vYZ[3]={0,1,1};
+    vY[3] = {0,1,0}, vZ[3] = {0,0,1};
 
   x1[0] = -fgkTransitHVtailXpos;
   x2[0] = -fgkTransitHVtailXpos;
@@ -1940,7 +1940,7 @@ TGeoVolumeAssembly *AliITSv11GeometrySDD::CreateLadder(Int_t iLay) {
     cableHV[iSegment].CreateAndInsertBoxCableSegment(2,0);
   };
 
-  vYZ[2] = -1;
+  //  vYZ[2] = -1;
   x1[0] = fgkTransitHVtailXpos;
   x2[0] = fgkTransitHVtailXpos;
   x3[0] = fgkTransitHVtailXpos;
@@ -5441,14 +5441,14 @@ TGeoVolumeAssembly *AliITSv11GeometrySDD::CreateDetectorsAssembly(Int_t iLay) {
 //
   
   Int_t    nDetectors   = fgkLay3Ndet;
-  Double_t ladderLength = fgkLay3LadderLength;
+  //  Double_t ladderLength = fgkLay3LadderLength;
   Double_t *sensorZPos  = fLay3sensorZPos;
   TGeoVolume *sensorSDD = fSDDsensor3;
 
   if (iLay==3) {}
   else if (iLay==4) {
     nDetectors   = fgkLay4Ndet;
-    ladderLength = fgkLay4LadderLength;
+    //    ladderLength = fgkLay4LadderLength;
     sensorZPos   = fLay4sensorZPos;
     sensorSDD    = fSDDsensor4;
   } else {
index 76c8557a336468bd9f581e7b604880df2351982e..748cd970304cf2400b6cca90e267623d940ded24 100644 (file)
@@ -3870,8 +3870,9 @@ void AliITSv11GeometrySSD::SetLadder(){
   /////////////////////////////////////////////////////////////////////////////                                                
   /// Generating Ladder Mother Volume Containing Ladder 
   /////////////////////////////////////////////////////////////////////////////                 
-  TGeoXtru* laddershape[fgkladdernumber];      
+  /*  TGeoXtru* laddershape[fgkladdernumber];  
   for(Int_t i=0; i<fgkladdernumber; i++) laddershape[i] = new TGeoXtru(2);
+  */
   const Int_t kmothervertexnumber = 8;  
   Double_t xmothervertex[fgkladdernumber][kmothervertexnumber];
   Double_t ymothervertex[fgkladdernumber][kmothervertexnumber];
@@ -4094,6 +4095,7 @@ void AliITSv11GeometrySSD::SetLadder(){
                                                                        j<2?1:2,fladdercablematrix[i][j]);
   }
 }
+
 ////////////////////////////////////////////////////////////////////////////////
 void AliITSv11GeometrySSD::SetLayer(){
 ////////////////////////////////////////////////////////////////////////////////