Fixes for Coverity warnings - M. Sitta

[u/mrichter/AliRoot.git] / STEER / AliMC.cxx

diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx
index 31860f8c747e5f73edec10f3384d4d90e902e74a..18668853f89cced8e10dff5924b633ced4aa1f57 100644 (file)
--- a/STEER/AliMC.cxx
+++ b/STEER/AliMC.cxx
@@ -144,6 +144,7 @@ void  AliMC::ConstructGeometry()
        return;
       }
     }
+    gMC->SetRootGeometry();
   }else{
     // Create modules, materials, geometry
     if (!gGeoManager) new TGeoManager("ALICE", "ALICE geometry");
@@ -812,12 +813,12 @@ void AliMC::ReadTransPar()
 
 
   const Int_t kncuts=10;
-  const Int_t knflags=11;
+  const Int_t knflags=12;
   const Int_t knpars=kncuts+knflags;
   const char kpars[knpars][7] = {"CUTGAM" ,"CUTELE","CUTNEU","CUTHAD","CUTMUO",
                               "BCUTE","BCUTM","DCUTE","DCUTM","PPCUTM","ANNI",
                               "BREM","COMP","DCAY","DRAY","HADR","LOSS",
-                              "MULS","PAIR","PHOT","RAYL"};
+                              "MULS","PAIR","PHOT","RAYL","STRA"};
   char line[256];
   char detName[7];
   char* filtmp;
@@ -853,10 +854,10 @@ void AliMC::ReadTransPar()
     if(!iret) continue;
     if(line[0]=='*') continue;
     // Read the numbers
-    iret=sscanf(line,"%s %d %f %f %f %f %f %f %f %f %f %f %d %d %d %d %d %d %d %d %d %d %d",
+    iret=sscanf(line,"%s %d %f %f %f %f %f %f %f %f %f %f %d %d %d %d %d %d %d %d %d %d %d %d",
                detName,&itmed,&cut[0],&cut[1],&cut[2],&cut[3],&cut[4],&cut[5],&cut[6],&cut[7],&cut[8],
                &cut[9],&flag[0],&flag[1],&flag[2],&flag[3],&flag[4],&flag[5],&flag[6],&flag[7],
-               &flag[8],&flag[9],&flag[10]);
+               &flag[8],&flag[9],&flag[10],&flag[11]);
     if(!iret) continue;
     if(iret<0) {
       //reading error
@@ -1188,7 +1189,7 @@ void AliMC::MakeTmpTrackRefsTree()
     fTmpFileTR = new TFile("TrackRefsTmp.root", "recreate");
     fTmpTreeTR = new TTree("TreeTR", "Track References");
     TClonesArray* pRef = &fTmpTrackReferences;
-    fTmpTreeTR->Branch("TrackReferences", "TClonesArray", &pRef, 4000);
+    fTmpTreeTR->Branch("TrackReferences", &pRef, 4000);
 }
 
 //_______________________________________________________________________
@@ -1209,7 +1210,6 @@ void AliMC::ReorderAndExpandTreeTR()
        TBranch *branch;
        TClonesArray* pRef = &fTrackReferences;
        branch = treeTR->Branch("TrackReferences", &pRef);
-       branch->SetAddress(&pRef);
     }
 
     AliStack* stack  = rl->Stack();