Merge pull request #1199 from gaponenko/nomuid

Remove muonID for the shielding assessment
Mu2e · Feb 26, 2024 · ea9030b · ea9030b
2 parents be084c9 + b4e2cb6
commit ea9030b
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 336 deletions.
diff --git a/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt
@@ -5,7 +5,6 @@ cet_make_library(
       src/ExtMonFNALMagnet.cc
       src/ExtMonFNALModule.cc
       src/ExtMonFNALModuleIdConverter.cc
-      src/ExtMonFNALMuonID.cc
       src/ExtMonFNALPixelChip.cc
       src/ExtMonFNALPixelIdConverter.cc
       src/ExtMonFNALPlane.cc

diff --git a/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh b/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh
@@ -20,7 +20,6 @@
 #include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALPlane.hh"
 #include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALPlaneStack.hh"
 #include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMagnet.hh"
-#include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh"
 
 namespace mu2e {
 
@@ -51,8 +50,6 @@ namespace mu2e {
 
       const ExtMonFNALMagnet& spectrometerMagnet() const { return spectrometerMagnet_; }
 
-      const ExtMonFNALMuonID& muonID() const { return muonID_; }
-
       // Location of the detector == that of the upstream stack.
       CLHEP::Hep3Vector detectorCenterInMu2e() const;
       const CLHEP::HepRotation& detectorRotationInMu2e() const;
@@ -86,9 +83,6 @@ namespace mu2e {
       CLHEP::Hep3Vector stackToExtMon_position(const CLHEP::Hep3Vector& pos) const {
         return (pos.z() < 0) ? dnStackToExtMon_position(pos) : upStackToExtMon_position(pos);
       }
-      CLHEP::Hep3Vector muonIDToExtMon_position(const CLHEP::Hep3Vector& muonIDpos) const {
-        return dnToExtMonCoordinateRotation_ * muonIDpos;
-      }
 
       //----------------------------------------------------------------
       // Pixel center in the coordinate system of its PlaneStack
@@ -127,7 +121,6 @@ namespace mu2e {
       ExtMonFNALPlaneStack up_;
       ExtMonFNALPlaneStack dn_;
       ExtMonFNALMagnet spectrometerMagnet_;
-      ExtMonFNALMuonID muonID_;
       CLHEP::HepRotationX dnToExtMonCoordinateRotation_;
     };
 

diff --git a/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh b/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh
diff --git a/ExtinctionMonitorFNAL/Geometry/src/ExtMonFNALMuonID.cc b/ExtinctionMonitorFNAL/Geometry/src/ExtMonFNALMuonID.cc
diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt
@@ -12,7 +12,6 @@ cet_make_library(
       src/ExtMonFNALBuildingMaker.cc
       src/ExtMonFNALMagnetMaker.cc
       src/ExtMonFNAL_Maker.cc
-      src/ExtMonFNALMuonIDMaker.cc
       src/ExtShieldDownstreamMaker.cc
       src/ExtShieldUpstreamMaker.cc
       src/G4GeometryOptions.cc

diff --git a/GeometryService/inc/ExtMonFNALMuonIDMaker.hh b/GeometryService/inc/ExtMonFNALMuonIDMaker.hh
diff --git a/GeometryService/src/ExtMonFNALMuonIDMaker.cc b/GeometryService/src/ExtMonFNALMuonIDMaker.cc
diff --git a/GeometryService/src/ExtMonFNAL_Maker.cc b/GeometryService/src/ExtMonFNAL_Maker.cc
@@ -2,7 +2,6 @@
 
 #include "Offline/GeometryService/inc/ExtMonFNAL_Maker.hh"
 #include "Offline/GeometryService/inc/ExtMonFNALMagnetMaker.hh"
-#include "Offline/GeometryService/inc/ExtMonFNALMuonIDMaker.hh"
 
 #include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh"
 #include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALBuilding.hh"
@@ -110,31 +109,6 @@ namespace mu2e {
       det->dn_.planeNumberOffset_ = 0;
       det->up_.planeNumberOffset_ = det->dn_.nplanes();
 
-      //----------------------------------------------------------------
-      //Muon ID Detector Addition
-      /*  det->muonID_ = ExtMonFNALMuonIDMaker::read(config,
-                                                  "extMonFNAL.muonID",
-                                                  room.collimator2RotationInMu2e(),
-                                                  refEntranceToMagnet,
-                                                  room.filterMagnet().nominalMomentum() + dp
-                                                  );*/
-      const CLHEP::Hep3Vector muonIDRefPointInMu2e = det->dn_.refPointInMu2e();
-      det->muonID_ = ExtMonFNALMuonIDMaker::read(config,
-                                                 "extMonFNAL.muonID",
-                                                  det->dn_.rotationInMu2e(),
-                                                  muonIDRefPointInMu2e,
-                                                  room.filterMagnet().nominalMomentum() + dp
-                                                  );
-      /*ExtMonFNALMuonID ExtMonFNALMuonIDMaker::read(const SimpleConfig& c, const std::string& prefix)
-      {
-        ExtMonFNALMuonID muid;
-
-        c. getVectorDouble(prefix + ".outerHalfSize", muid.outerHalfSize_, 3);
-           if(verbose){
-          std::cout<<"ExtMonFNALMuonID " <<prefix<<": outerHalfSize = "<<muid.outerHalfSize_<<std::endl;
-          }
-        return muid;
-      }*/
      //----------------------------------------------------------------
       if(verbose) {
         std::cout<<"ExtMonFNAL_Maker: UP stack center in Mu2e = "<<det->up_.m_stackRefPointInMu2e<<std::endl;
@@ -150,9 +124,6 @@ namespace mu2e {
 
         std::cout<<"ExtMonFNAL_Maker: DN stack center in Mu2e = "<<det->dn_.m_stackRefPointInMu2e<<std::endl;
         std::cout<<"ExtMonFNAL_Maker: DN stackRotationInMu2e = "<<det->dn_.m_stackRotationInMu2e<<std::endl;
-               std::cout<<"ExtMonFNAL_Maker: Muon ID ref in Mu2e = "<<det->muonID_.refPointInMu2e()<<std::endl;
-        //std::cout<<"ExtMonFNAL_Maker: Muon ID center in Mu2e = "<<det->muonID_.geometricCenterInMu2e()<<std::endl;
-               std::cout<<"ExtMonFNAL_Maker: Muon ID rotation in Mu2e = "<<det->muonID_.muonIDRotationInMu2e()<<std::endl;
       }
 
       AGDEBUG("ExtMonFNAL maker end");

diff --git a/GeometryService/src/GeometryService.cc b/GeometryService/src/GeometryService.cc
@@ -84,8 +84,6 @@
 #include "Offline/STMGeom/inc/STM.hh"
 #include "Offline/GeometryService/inc/STMMaker.hh"
 #include "Offline/GeometryService/inc/Mu2eEnvelope.hh"
-#include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh"
-#include "Offline/GeometryService/inc/ExtMonFNALMuonIDMaker.hh"
 #include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh"
 #include "Offline/GeometryService/inc/PTMMaker.hh"
 #include "Offline/PTMGeom/inc/PTM.hh"
@@ -330,7 +328,6 @@ namespace mu2e {
     addDetector(std::move(tmpemb));
     if(_config->getBool("hasExtMonFNAL",false)){
       addDetector(ExtMonFNAL::ExtMonMaker::make(*_config, emfb));
-      addDetector(ExtMonFNALMuonIDMaker::make(*_config));
     }
 
 

diff --git a/Mu2eG4/geom/extmon_fnal_v02.txt b/Mu2eG4/geom/extmon_fnal_v02.txt
@@ -201,23 +201,6 @@ vector<double> extMonFNAL.dn.module_yoffset = { 16.7, 0., -16.7 };
 vector<double> extMonFNAL.dn.module_zoffset = { 1., -1., 1. }; // just determines which side of the plane; all math is handed in constructExMonFNAL
 vector<double> extMonFNAL.dn.module_rotation = { 0., 0., 180. };
 
-
-
-//Addition of the Muon ID detector will be placed here
-// Jackson Waters 2018
-//Right now it will be a rectangular box with 3D rotation
-
-vector<double> extMonFNAL.muonID.motherTransverseHalfSize = {200, 200};//mm x, y
-string extMonFNAL.muonID.material  = "G4_Fe";
-
-bool extMonFNAL.muonID.iron.visible = true;
-bool extMonFNAL.muonID.iron.solid = true;
-
-// Placing the box in the z-position based off of the start and end points of the z-position of the downstream pixel planes
-
-double extMonFNAL.muonID.motherStartZ = -2500.;
-double extMonFNAL.muonID.motherEndZ = -700.;
-
 //----------------------------------------------------------------
 // These are detector VDs (not filter ones)
 //

diff --git a/Mu2eG4/geom/geom_common_trackerVST.txt b/Mu2eG4/geom/geom_common_trackerVST.txt
@@ -418,7 +418,6 @@ string extMonFNAL.concreteMaterial = "G4_AIR";
 string extMonFNAL.filter.magnet.material = "G4_AIR";
 string extMonFNAL.spectrometer.magnet.material = "G4_AIR";
 string extMonFNAL.planeMaterial = "G4_AIR";
-string extMonFNAL.muonID.material = "G4_AIR";
 string extMonFNAL.room.materialName = "G4_AIR";
 string extMonFNAL.room.wall.materialName = "G4_AIR";
 string ExtShieldDownstream.materialType1 = "G4_AIR";

diff --git a/Mu2eG4/inc/constructExtMonFNAL.hh b/Mu2eG4/inc/constructExtMonFNAL.hh
@@ -15,7 +15,6 @@ namespace mu2e {
 
   class SimpleConfig;
   class ExtMonFNALMagnet;
-  class ExtMonFNALMuonID;
 
   void constructExtMonFNAL(const VolumeInfo& collimator1Parent,
                            const CLHEP::HepRotation& collimator1ParentRotationInMu2e,
@@ -60,14 +59,6 @@ namespace mu2e {
                                   bool const placePV
                                   );
 
-  void constructExtMonFNALMuonID(const ExtMonFNALModule& module,
-                                 const ExtMonFNALMuonID& muid,
-                                 const std::string& volNameSuffix,
-                                 const VolumeInfo& parent,
-                                 const CLHEP::HepRotation& parentRotationInMu2e,
-                                 const SimpleConfig& config
-                                 );
-
 }
 
 #endif /* CONSTRUCTEXTMONFNAL_HH */