update for detector facing inisde, elum 3
This commit is contained in:
parent
95bff19bb4
commit
095b36edba
|
@ -179,7 +179,7 @@ inline bool DetGeo::LoadDetectorGeo(TMacro * macro, bool verbose){
|
||||||
std::vector<std::string> str = AnalysisLib::SplitStr(line, " ");
|
std::vector<std::string> str = AnalysisLib::SplitStr(line, " ");
|
||||||
|
|
||||||
// printf("%3d | %s\n", i, str[0].c_str());
|
// 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 ) break;
|
||||||
if( str[0].find("#===") != std::string::npos ) {
|
if( str[0].find("#===") != std::string::npos ) {
|
||||||
detFlag ++;
|
detFlag ++;
|
||||||
|
|
|
@ -302,13 +302,13 @@ int HELIOS::CheckDetAcceptance(){
|
||||||
if( array.firstPos > 0 && orbitb.z < 0 ) {acceptanceCode = -2; return acceptanceCode;}
|
if( array.firstPos > 0 && orbitb.z < 0 ) {acceptanceCode = -2; return acceptanceCode;}
|
||||||
|
|
||||||
// -11 ======== rho is too small
|
// -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)
|
// -15 ========= if detRowID == -1, should be (2 * orbitb.rho < perpDist)
|
||||||
if( orbitb.detRowID == -1 ) {acceptanceCode = -15; return acceptanceCode;}
|
if( orbitb.detRowID == -1 ) {acceptanceCode = -15; return acceptanceCode;}
|
||||||
|
|
||||||
// -10 =========== when rho is too big .
|
// -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
|
// -14 ========== check particle-B hit radius on recoil dectector
|
||||||
if( isCoincidentWithRecoil && orbitB.R > aux.outerRadius ) {acceptanceCode = -14; return acceptanceCode;}
|
if( isCoincidentWithRecoil && orbitB.R > aux.outerRadius ) {acceptanceCode = -14; return acceptanceCode;}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user