From 095b36edba70ccb99e16ae59bae13315158ea5ab Mon Sep 17 00:00:00 2001 From: "Ryan@MBA2024" Date: Tue, 30 Jul 2024 20:32:21 -0500 Subject: [PATCH] update for detector facing inisde, elum 3 --- Armory/ClassDetGeo.h | 2 +- Cleopatra/ClassHelios.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Armory/ClassDetGeo.h b/Armory/ClassDetGeo.h index 01ecb23..41b0bf5 100644 --- a/Armory/ClassDetGeo.h +++ b/Armory/ClassDetGeo.h @@ -179,7 +179,7 @@ inline bool DetGeo::LoadDetectorGeo(TMacro * macro, bool verbose){ std::vector str = AnalysisLib::SplitStr(line, " "); // printf("%3d | %s\n", i, str[0].c_str()); - + if( str[0].find("#//") != std::string::npos ) continue; if( str[0].find("####") != std::string::npos ) break; if( str[0].find("#===") != std::string::npos ) { detFlag ++; diff --git a/Cleopatra/ClassHelios.h b/Cleopatra/ClassHelios.h index 8ec6a07..6ab1893 100644 --- a/Cleopatra/ClassHelios.h +++ b/Cleopatra/ClassHelios.h @@ -302,13 +302,13 @@ int HELIOS::CheckDetAcceptance(){ if( array.firstPos > 0 && orbitb.z < 0 ) {acceptanceCode = -2; return acceptanceCode;} // -11 ======== rho is too small - if( 2 * orbitb.rho < array.detPerpDist ) { acceptanceCode = -11; return acceptanceCode;} + if( 2 * orbitb.rho < array.detPerpDist ) { acceptanceCode = -11; return acceptanceCode;} // -15 ========= if detRowID == -1, should be (2 * orbitb.rho < perpDist) if( orbitb.detRowID == -1 ) {acceptanceCode = -15; return acceptanceCode;} // -10 =========== when rho is too big . - if( detGeo.bore < 2 * orbitb.rho) { acceptanceCode = -10; return acceptanceCode;} + if( array.detFaceOut && detGeo.bore < 2 * orbitb.rho) { acceptanceCode = -10; return acceptanceCode;} // -14 ========== check particle-B hit radius on recoil dectector if( isCoincidentWithRecoil && orbitB.R > aux.outerRadius ) {acceptanceCode = -14; return acceptanceCode;}