Increasing the class version number.

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

diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx
index 3ee3b2f8b6daceca253ab0298b19fc5cfc47cb96..f18473ffadeefdc00988a945c8575dbc9472cc77 100644 (file)
--- a/STEER/AliMC.cxx
+++ b/STEER/AliMC.cxx
@@ -21,6 +21,8 @@
 // Author: F.Carminati
 //         Federico.Carminati@cern.ch
 
+#include <string.h>
+
 #include <RVersion.h>
 #include <TArrayI.h>
 #include <TClonesArray.h>
@@ -813,12 +815,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;
@@ -841,9 +843,9 @@ void AliMC::ReadTransPar()
     for(i=0;i<kncuts;i++) cut[i]=-99;
     for(i=0;i<knflags;i++) flag[i]=-99;
     itmed=0;
-    for(i=0;i<256;i++) line[i]='\0';
+    memset(line,0,256);
     // Read up to the end of line excluded
-    iret=fscanf(lun,"%[^\n]",line);
+    iret=fscanf(lun,"%255[^\n]",line);
     if(iret<0) {
       //End of file
       fclose(lun);
@@ -854,10 +856,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
@@ -919,7 +921,7 @@ void AliMC::AddHit(Int_t id, Int_t track, Int_t *vol, Float_t *hits) const
   //  Add a hit to detector id
   //
   TObjArray &dets = *gAlice->Modules();
-  if(dets[id]) dynamic_cast<AliModule*>(dets[id])->AddHit(track,vol,hits);
+  if(dets[id]) static_cast<AliModule*>(dets[id])->AddHit(track,vol,hits);
 }
 
 //_______________________________________________________________________
@@ -929,7 +931,7 @@ void AliMC::AddDigit(Int_t id, Int_t *tracks, Int_t *digits) const
   // Add digit to detector id
   //
   TObjArray &dets = *gAlice->Modules();
-  if(dets[id]) dynamic_cast<AliModule*>(dets[id])->AddDigit(tracks,digits);
+  if(dets[id]) static_cast<AliModule*>(dets[id])->AddDigit(tracks,digits);
 }
 
 //_______________________________________________________________________
@@ -1111,7 +1113,7 @@ void AliMC::ResetTrackReferences()
 }
 
 //_______________________________________________________________________
-void AliMC::RemapTrackReferencesIDs(Int_t *map)
+void AliMC::RemapTrackReferencesIDs(const Int_t *map)
 {
   // 
   // Remapping track reference
@@ -1189,7 +1191,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);
 }
 
 //_______________________________________________________________________
@@ -1205,13 +1207,9 @@ void AliMC::ReorderAndExpandTreeTR()
     AliDebug(1, "fRunLoader->MakeTrackRefsContainer()");
     rl->MakeTrackRefsContainer(); 
     TTree * treeTR = rl->TreeTR();
-    if (treeTR){
        // make branch for central track references
-       TBranch *branch;
        TClonesArray* pRef = &fTrackReferences;
-       branch = treeTR->Branch("TrackReferences", &pRef);
-       branch->SetAddress(&pRef);
-    }
+       treeTR->Branch("TrackReferences", &pRef);
 
     AliStack* stack  = rl->Stack();
     Int_t np = stack->GetNprimary();