Using underscore in the names of materials, media, and mixtures(R.Grosso)

diff --git a/FMD/AliFMDGeoSimulator.cxx b/FMD/AliFMDGeoSimulator.cxx
index 3799dd52c6e7c03aabe2be26e6d7f8afb7a7483d..cbcdc64c70376e7805b3ee70f8add3ddda375de0 100644 (file)
--- a/FMD/AliFMDGeoSimulator.cxx
+++ b/FMD/AliFMDGeoSimulator.cxx
@@ -157,13 +157,13 @@ AliFMDGeoSimulator::DefineMaterials()
     return;
   }
   AliFMDSimulator::DefineMaterials();
-  fSi      = gGeoManager->GetMedium("FMDSi$");
-  fC       = gGeoManager->GetMedium("FMDCarbon$");
-  fAl      = gGeoManager->GetMedium("FMDAluminum$");
-  fChip    = gGeoManager->GetMedium("FMDChip$");
-  fAir     = gGeoManager->GetMedium("FMDAir$");
-  fPCB     = gGeoManager->GetMedium("FMDPCB$");
-  fPlastic = gGeoManager->GetMedium("FMDPlastic$");
+  fSi      = gGeoManager->GetMedium("FMD_Si$");
+  fC       = gGeoManager->GetMedium("FMD_Carbon$");
+  fAl      = gGeoManager->GetMedium("FMD_Aluminum$");
+  fChip    = gGeoManager->GetMedium("FMD_Chip$");
+  fAir     = gGeoManager->GetMedium("FMD_Air$");
+  fPCB     = gGeoManager->GetMedium("FMD_PCB$");
+  fPlastic = gGeoManager->GetMedium("FMD_Plastic$");
 }
 
 //____________________________________________________________________

diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx
index 099237fa341ed32ecde29cabbf830ca7456cc308..a3ed600b345d3910c0a0590d59a7d5205aaf0970 100644 (file)
--- a/STEER/AliMC.cxx
+++ b/STEER/AliMC.cxx
@@ -310,9 +310,9 @@ void AliMC::Stepping()
     AddEnergyDeposit(gMC->CurrentVolID(copy),gMC->Edep());
     //
     // write tracke reference for track which is dissapearing - MI
-    if (gMC->IsTrackDisappeared()) {      
-       if (gMC->Etot()>0.05) AddTrackReference(GetCurrentTrackNumber());
-    }
+//     if (gMC->IsTrackDisappeared()) {      
+//     if (gMC->Etot()>0.05) AddTrackReference(GetCurrentTrackNumber());
+//     }
   
     //Call the appropriate stepping routine;
     AliModule *det = dynamic_cast<AliModule*>(gAlice->Modules()->At(id));

diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx
index 61fa6ae2e770c8b9e3bd95335f42a22c2e397ce7..80c255dd9fae4c39656c7cfcb663a33089de4d9e 100644 (file)
--- a/STEER/AliModule.cxx
+++ b/STEER/AliModule.cxx
@@ -247,6 +247,7 @@ void AliModule::AliMaterial(Int_t imat, const char* name, Float_t a,
   //
   Int_t kmat;
   TString uniquename = GetName();
+  uniquename.Append("_");
   uniquename.Append(name);
   if(gAlice->IsRootGeometry()){
     TGeoMaterial *mat = gGeoManager->GetMaterial(uniquename.Data());
@@ -309,6 +310,7 @@ void AliModule::AliMixture(Int_t imat, const char *name, Float_t *a,
   //
   Int_t kmat;
   TString uniquename = GetName();
+  uniquename.Append("_");
   uniquename.Append(name);
   if(gAlice->IsRootGeometry()){
     TGeoMaterial *mat = gGeoManager->GetMaterial(uniquename.Data());
@@ -350,6 +352,7 @@ void AliModule::AliMedium(Int_t numed, const char *name, Int_t nmat,
   //  
   Int_t kmed;
   TString uniquename = GetName();
+  uniquename.Append("_");
   uniquename.Append(name);
   if(gAlice->IsRootGeometry()){
     TList *medialist = gGeoManager->GetListOfMedia();