From fa914fe66c4d3888f51d45a6db9b29b399e8a45e Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 16 Mar 2006 10:05:25 +0000 Subject: [PATCH] GetMedium replaced by CurrentMedium (I.Hrivnacova) --- PMD/AliPMDv0.cxx | 2 +- PMD/AliPMDv1.cxx | 2 +- RICH/AliRICHv0.cxx | 2 +- TOF/AliTOFv0.cxx | 2 +- TOF/AliTOFv1.cxx | 2 +- TOF/AliTOFv2.cxx | 2 +- TOF/AliTOFv2FHoles.cxx | 2 +- TOF/AliTOFv3.cxx | 2 +- TOF/AliTOFv4.cxx | 2 +- ZDC/AliZDCv1.cxx | 20 ++++++++++---------- ZDC/AliZDCv2.cxx | 18 +++++++++--------- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/PMD/AliPMDv0.cxx b/PMD/AliPMDv0.cxx index a8875fc28c0..6fb03647b11 100644 --- a/PMD/AliPMDv0.cxx +++ b/PMD/AliPMDv0.cxx @@ -932,7 +932,7 @@ void AliPMDv0::StepManager() Int_t vol[5]; //char *namep; - if(gMC->GetMedium() == fMedSens && (destep = gMC->Edep())) { + if(gMC->CurrentMedium() == fMedSens && (destep = gMC->Edep())) { gMC->CurrentVolID(copy); diff --git a/PMD/AliPMDv1.cxx b/PMD/AliPMDv1.cxx index 26b03816356..6cbbcd8e62d 100644 --- a/PMD/AliPMDv1.cxx +++ b/PMD/AliPMDv1.cxx @@ -816,7 +816,7 @@ void AliPMDv1::StepManager() Int_t vol[8]; //const char *namep; - if(gMC->GetMedium() == fMedSens && (destep = gMC->Edep())) { + if(gMC->CurrentMedium() == fMedSens && (destep = gMC->Edep())) { gMC->CurrentVolID(copy); //namep=gMC->CurrentVolName(); diff --git a/RICH/AliRICHv0.cxx b/RICH/AliRICHv0.cxx index f532ed71762..e5a57c6ac8d 100644 --- a/RICH/AliRICHv0.cxx +++ b/RICH/AliRICHv0.cxx @@ -80,7 +80,7 @@ void AliRICHv0::StepManager() Int_t mid=gMC->CurrentMaterial(a,z,den,rad,abs); Info("Material","id=%i a=%7.2f z=%7.2f den=%9.4f rad=%9.2f abs=%9.2f",mid,a,z,den,rad,abs); - Int_t iTmedId=gMC->GetMedium(); + Int_t iTmedId=gMC->CurrentMedium(); const char *sTmed; switch(iTmedId){ case kAir: sTmed="Air" ;break; diff --git a/TOF/AliTOFv0.cxx b/TOF/AliTOFv0.cxx index 1fec9745dc0..05aef4b265c 100644 --- a/TOF/AliTOFv0.cxx +++ b/TOF/AliTOFv0.cxx @@ -972,7 +972,7 @@ void AliTOFv0::StepManager() Int_t *idtmed = fIdtmed->GetArray()-499; Float_t incidenceAngle; - if(gMC->GetMedium()==idtmed[513] && + if(gMC->CurrentMedium()==idtmed[513] && gMC->IsTrackEntering() && gMC->TrackCharge() && gMC->CurrentVolID(copy)==fIdSens) { diff --git a/TOF/AliTOFv1.cxx b/TOF/AliTOFv1.cxx index 8e0b8ee64b7..bce79d94a05 100644 --- a/TOF/AliTOFv1.cxx +++ b/TOF/AliTOFv1.cxx @@ -1058,7 +1058,7 @@ void AliTOFv1::StepManager() Int_t *idtmed = fIdtmed->GetArray()-499; Float_t incidenceAngle; - if(gMC->GetMedium()==idtmed[513] && + if(gMC->CurrentMedium()==idtmed[513] && gMC->IsTrackEntering() && gMC->TrackCharge() && gMC->CurrentVolID(copy)==fIdSens) { diff --git a/TOF/AliTOFv2.cxx b/TOF/AliTOFv2.cxx index 549f7f1f2dc..396b759df58 100644 --- a/TOF/AliTOFv2.cxx +++ b/TOF/AliTOFv2.cxx @@ -1071,7 +1071,7 @@ void AliTOFv2::StepManager() Int_t *idtmed = fIdtmed->GetArray()-499; Float_t incidenceAngle; - if(gMC->GetMedium()==idtmed[513] && + if(gMC->CurrentMedium()==idtmed[513] && gMC->IsTrackEntering() && gMC->TrackCharge() && gMC->CurrentVolID(copy)==fIdSens) { diff --git a/TOF/AliTOFv2FHoles.cxx b/TOF/AliTOFv2FHoles.cxx index 7dde1d8f516..2c63e8ed0c1 100644 --- a/TOF/AliTOFv2FHoles.cxx +++ b/TOF/AliTOFv2FHoles.cxx @@ -1080,7 +1080,7 @@ void AliTOFv2FHoles::StepManager() Int_t *idtmed = fIdtmed->GetArray()-499; Float_t incidenceAngle; - if(gMC->GetMedium()==idtmed[513] && + if(gMC->CurrentMedium()==idtmed[513] && gMC->IsTrackEntering() && gMC->TrackCharge() && gMC->CurrentVolID(copy)==fIdSens) { diff --git a/TOF/AliTOFv3.cxx b/TOF/AliTOFv3.cxx index c7bf9dd9a91..587b13b6ec5 100644 --- a/TOF/AliTOFv3.cxx +++ b/TOF/AliTOFv3.cxx @@ -1060,7 +1060,7 @@ void AliTOFv3::StepManager() Int_t *idtmed = fIdtmed->GetArray()-499; Float_t incidenceAngle; - if(gMC->GetMedium()==idtmed[513] && + if(gMC->CurrentMedium()==idtmed[513] && gMC->IsTrackEntering() && gMC->TrackCharge() && gMC->CurrentVolID(copy)==fIdSens) { diff --git a/TOF/AliTOFv4.cxx b/TOF/AliTOFv4.cxx index 93ae0ae4d85..8be9ad4c694 100644 --- a/TOF/AliTOFv4.cxx +++ b/TOF/AliTOFv4.cxx @@ -1060,7 +1060,7 @@ void AliTOFv4::StepManager() Int_t *idtmed = fIdtmed->GetArray()-499; Float_t incidenceAngle; - if(gMC->GetMedium()==idtmed[513] && + if(gMC->CurrentMedium()==idtmed[513] && gMC->IsTrackEntering() && gMC->TrackCharge() && gMC->CurrentVolID(copy)==fIdSens) { diff --git a/ZDC/AliZDCv1.cxx b/ZDC/AliZDCv1.cxx index 4bc8b34e3da..defa34f1d50 100644 --- a/ZDC/AliZDCv1.cxx +++ b/ZDC/AliZDCv1.cxx @@ -1184,23 +1184,23 @@ void AliZDCv1::StepManager() for (j=0;j<10;j++) hits[j]=0; - if((gMC->GetMedium() == fMedSensZN) || (gMC->GetMedium() == fMedSensZP) || - (gMC->GetMedium() == fMedSensGR) || (gMC->GetMedium() == fMedSensF1) || - (gMC->GetMedium() == fMedSensF2) || (gMC->GetMedium() == fMedSensZEM)){ + if((gMC->CurrentMedium() == fMedSensZN) || (gMC->CurrentMedium() == fMedSensZP) || + (gMC->CurrentMedium() == fMedSensGR) || (gMC->CurrentMedium() == fMedSensF1) || + (gMC->CurrentMedium() == fMedSensF2) || (gMC->CurrentMedium() == fMedSensZEM)){ // --- This part is for no shower developement in beam pipe and TDI -// (gMC->GetMedium() == fMedSensPI) || (gMC->GetMedium() == fMedSensTDI)){ +// (gMC->CurrentMedium() == fMedSensPI) || (gMC->CurrentMedium() == fMedSensTDI)){ // If particle interacts with beam pipe -> return -// if((gMC->GetMedium() == fMedSensPI) || (gMC->GetMedium() == fMedSensTDI)){ +// if((gMC->CurrentMedium() == fMedSensPI) || (gMC->CurrentMedium() == fMedSensTDI)){ // If option NoShower is set -> StopTrack // if(fNoShower==1) { -// if(gMC->GetMedium() == fMedSensPI) { +// if(gMC->CurrentMedium() == fMedSensPI) { // knamed = gMC->CurrentVolName(); // if((!strncmp(knamed,"MQ",2)) || (!strncmp(knamed,"YM",2))) fpLostIT += 1; // if((!strncmp(knamed,"MD1",3))|| (!strncmp(knamed,"YD1",2))) fpLostD1 += 1; // } -// if(gMC->GetMedium() == fMedSensTDI) fpLostTDI += 1; +// if(gMC->CurrentMedium() == fMedSensTDI) fpLostTDI += 1; // gMC->StopTrack(); // printf("\n # of p lost in Inner Triplet = %d\n",fpLostIT); // printf("\n # of p lost in D1 = %d\n",fpLostD1); @@ -1310,7 +1310,7 @@ void AliZDCv1::StepManager() // *** Light production in fibres - if((gMC->GetMedium() == fMedSensF1) || (gMC->GetMedium() == fMedSensF2)){ + if((gMC->CurrentMedium() == fMedSensF1) || (gMC->CurrentMedium() == fMedSensF2)){ //Select charged particles if((destep=gMC->Edep())){ @@ -1378,7 +1378,7 @@ void AliZDCv1::StepManager() nphe = gRandom->Poisson(out); // printf("ZN --- ibeta = %d, ialfa = %d, ibe = %d" // " -> out = %f, nphe = %d\n", ibeta, ialfa, ibe, out, nphe); - if(gMC->GetMedium() == fMedSensF1){ + if(gMC->CurrentMedium() == fMedSensF1){ hits[7] = nphe; //fLightPMQ hits[8] = 0; hits[9] = 0; @@ -1397,7 +1397,7 @@ void AliZDCv1::StepManager() nphe = gRandom->Poisson(out); // printf("ZP --- ibeta = %d, ialfa = %d, ibe = %d" // " -> out = %f, nphe = %d\n", ibeta, ialfa, ibe, out, nphe); - if(gMC->GetMedium() == fMedSensF1){ + if(gMC->CurrentMedium() == fMedSensF1){ hits[7] = nphe; //fLightPMQ hits[8] = 0; hits[9] = 0; diff --git a/ZDC/AliZDCv2.cxx b/ZDC/AliZDCv2.cxx index 8758649484f..af8f1182838 100644 --- a/ZDC/AliZDCv2.cxx +++ b/ZDC/AliZDCv2.cxx @@ -1213,15 +1213,15 @@ void AliZDCv2::StepManager() // --- This part is for no shower developement in beam pipe and TDI // If particle interacts with beam pipe or TDI -> return - if((gMC->GetMedium() == fMedSensPI) || (gMC->GetMedium() == fMedSensTDI)){ + if((gMC->CurrentMedium() == fMedSensPI) || (gMC->CurrentMedium() == fMedSensTDI)){ // If option NoShower is set -> StopTrack if(fNoShower==1) { - if(gMC->GetMedium() == fMedSensPI) { + if(gMC->CurrentMedium() == fMedSensPI) { knamed = gMC->CurrentVolName(); if(!strncmp(knamed,"YMQ",3)) fpLostIT += 1; if(!strncmp(knamed,"YD1",3)) fpLostD1 += 1; } - else if(gMC->GetMedium() == fMedSensTDI){ // NB->Cu = TDI or D1 vacuum chamber + else if(gMC->CurrentMedium() == fMedSensTDI){ // NB->Cu = TDI or D1 vacuum chamber knamed = gMC->CurrentVolName(); if(!strncmp(knamed,"MD1",3)) fpLostD1 += 1; if(!strncmp(knamed,"QTD",3)) fpLostTDI += 1; @@ -1234,9 +1234,9 @@ void AliZDCv2::StepManager() return; } - if((gMC->GetMedium() == fMedSensZN) || (gMC->GetMedium() == fMedSensZP) || - (gMC->GetMedium() == fMedSensGR) || (gMC->GetMedium() == fMedSensF1) || - (gMC->GetMedium() == fMedSensF2) || (gMC->GetMedium() == fMedSensZEM)){ + if((gMC->CurrentMedium() == fMedSensZN) || (gMC->CurrentMedium() == fMedSensZP) || + (gMC->CurrentMedium() == fMedSensGR) || (gMC->CurrentMedium() == fMedSensF1) || + (gMC->CurrentMedium() == fMedSensF2) || (gMC->CurrentMedium() == fMedSensZEM)){ //Particle coordinates @@ -1353,7 +1353,7 @@ void AliZDCv2::StepManager() // *** Light production in fibres - if((gMC->GetMedium() == fMedSensF1) || (gMC->GetMedium() == fMedSensF2)){ + if((gMC->CurrentMedium() == fMedSensF1) || (gMC->CurrentMedium() == fMedSensF2)){ //Select charged particles if((destep=gMC->Edep())){ @@ -1411,7 +1411,7 @@ void AliZDCv2::StepManager() // Ch. debug //if(ibeta==3) printf("\t %f \t %f \t %f\n",alfa, be, out); //printf("\t ibeta = %d, ialfa = %d, ibe = %d -> nphe = %d\n\n",ibeta,ialfa,ibe,nphe); - if(gMC->GetMedium() == fMedSensF1){ + if(gMC->CurrentMedium() == fMedSensF1){ hits[7] = nphe; //fLightPMQ hits[8] = 0; hits[9] = 0; @@ -1428,7 +1428,7 @@ void AliZDCv2::StepManager() if(ibe>fNbep) ibe=fNbep; out = charge*charge*fTablep[ibeta][ialfa][ibe]; nphe = gRandom->Poisson(out); - if(gMC->GetMedium() == fMedSensF1){ + if(gMC->CurrentMedium() == fMedSensF1){ hits[7] = nphe; //fLightPMQ hits[8] = 0; hits[9] = 0; -- 2.43.0