X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=FMD%2FAliFMDv1.cxx;h=2e9436a4bded7013e9c00be121b05b74ba95ad75;hp=60d04c26dc6712af94022c59aa3008896edd6bed;hb=afddaa11a81020e9e7f5e48ca2c1962ec7e94694;hpb=e819460c17817bad38c115eb25db19e0b2166b1f diff --git a/FMD/AliFMDv1.cxx b/FMD/AliFMDv1.cxx index 60d04c26dc6..2e9436a4bde 100644 --- a/FMD/AliFMDv1.cxx +++ b/FMD/AliFMDv1.cxx @@ -120,21 +120,19 @@ AliFMDv1::StepManager() // Only process charged particles if(TMath::Abs(gMC->TrackCharge()) <= 0) return; - TString vol(gMC->CurrentVolName()); - std::cout << "Is inside " << vol << " ... " << std::endl; + // TString vol(gMC->CurrentVolName()); + // std::cout << "Is inside " << vol << " ... " << std::endl; // Only do stuff is the track is in one of the strips. // TString vol(gMC->CurrentVolName()); // if (!vol.Contains("STR")) return; Int_t copy; Int_t volumeId = gMC->CurrentVolID(copy); - if (volumeId != fInner->GetStripId() || volumeId != fOuter->GetStripId()) { - std::cout << "Not a FMD strip volume: " - << volumeId << " != " << fInner->GetStripId() << " or " - << fOuter->GetStripId() << std::endl; - return; - } - std::cout << "OK, an FMD strip volume!" << std::endl; - + // The ring ID is encoded in the volume name + Char_t ring = '\0'; + if (volumeId == fInner->GetStripId()) ring = 'I'; + else if (volumeId == fOuter->GetStripId()) ring = 'O'; + else return; + // Get the strip number. Note, that GEANT numbers divisions from 1, // so we subtract one Int_t strip = copy - 1; @@ -161,9 +159,7 @@ AliFMDv1::StepManager() // The sector number, calculated from module and phi division # Int_t sector = 2 * module + phiDiv - 1; - // The ring ID is encoded in the volume name - Char_t ring = vol[3]; - + // Get a pointer to the sub detector structure AliFMDSubDetector* det = 0; switch (detector) {