load AddTaskEmcalJet.C

[u/mrichter/AliRoot.git] / ITS / AliITS.cxx

diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx
index 89954c56058e6565256dba0f488350de40b5a173..ae9d9b566e9624a347377379a041e545ee8e0b29 100644 (file)
--- a/ITS/AliITS.cxx
+++ b/ITS/AliITS.cxx
@@ -286,7 +286,7 @@ void AliITS::Init(){
     //      none.
     Int_t i;
     // Array of TStrings
-    if(gMC) for(i=0;i<fIdN;i++) fIdSens[i] = gMC->VolId(fIdName[i]);
+    if(TVirtualMC::GetMC()) for(i=0;i<fIdN;i++) fIdSens[i] = TVirtualMC::GetMC()->VolId(fIdName[i]);
  
 }
 //______________________________________________________________________
@@ -1269,7 +1269,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
     TClonesArray& dum = *fModA[module];
     fDetTypeSim->GetSimuParam()->SPDThresholds(module,thr,sigma);
     thr += 1.;
-    int label = -1;
+    int label = kMaxLabel;
     if (rawID2clusID) { // RS If the raw->cluster ID is set (filled by cluster finder) store cluster ID's in SDigits
       if (rawID2clusID->GetSize()<=countRW) {AliError(Form("The buffer of rawSPD to clusSPD ID's is shorter than current rawSPD ID=%d",countRW));}
       else label = (*rawID2clusID)[countRW];
@@ -1316,7 +1316,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
       if (module >= size) continue;
       last = fModA[module]->GetEntries();
       TClonesArray& dum = *fModA[module];
-      int label = -1;
+      int label = kMaxLabel;
       if (rawID2clusID) { // RS If the raw->cluster ID is set (filled by cluster finder) store cluster ID's in SDigits
        if (rawID2clusID->GetSize()<=countRW) {AliError(Form("The buffer of rawSDD to clusSDD ID's is shorter than current rawSDD ID=%d",countRW));}
        else label = (*rawID2clusID)[countRW];
@@ -1352,7 +1352,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
        
     last = fModA[module]->GetEntries();
     TClonesArray& dum = *fModA[module];
-    int label = -1;
+    int label = kMaxLabel;
     if (rawID2clusID) { // RS If the raw->cluster ID is set (filled by cluster finder) store cluster ID's in SDigits
       if (rawID2clusID->GetSize()<=countRW) {AliError(Form("The buffer of rawSSD to clusSSD ID's is shorter than current rawSSD ID=%d",countRW));}
       else label = (*rawID2clusID)[countRW];
@@ -1398,9 +1398,8 @@ void AliITS::UpdateInternalGeometry(){
 //   AliDebug(1,"Delete ITSgeom and create a new one reading TGeo");
 
   AliITSVersion_t version = (AliITSVersion_t)IsVersion();
-  Int_t minor = 0;
   AliITSInitGeometry initgeom;
-  AliITSgeom* geom = initgeom.CreateAliITSgeom(version,minor);
+  AliITSgeom* geom = initgeom.CreateAliITSgeom(version);
   SetITSgeom(geom);
 }
 //______________________________________________________________________
@@ -1416,3 +1415,5 @@ void AliITS::WriteFOSignals(){
   fDetTypeSim->ProcessNoiseForFastOr();
   fDetTypeSim->WriteFOSignals();
 }
+
+