Fixed conflicts merging main

MuonColliderSoft · Oct 10, 2024 · 05fce90 · 05fce90
2 parents 005d63f + 9bb6fa7
commit 05fce90
Show file tree

Hide file tree

Showing 10 changed files with 731 additions and 54 deletions.
diff --git a/ACTSTracking/ACTSProcBase.hxx b/ACTSTracking/ACTSProcBase.hxx
@@ -61,10 +61,12 @@ class ACTSProcBase : public marlin::Processor {
   std::string _matFile{};
 
   //! Path to tracker geometry file
-  std::string _tgeoFile = "data/MuColl_v1.root";
+  std::string _tgeoFile = "data/MuSIC_v2.root";
 
   //! Path to tracker geometry json file
-  std::string _tgeodescFile = "data/MuColl_v1.json";
+  std::string _tgeodescFile = "data/MuSIC_v2.json";
+
+  std::string _detSchema = "MuSIC_v2";
 
   std::shared_ptr<ACTSTracking::GeometryIdMappingTool> geoIDMappingTool() const;
 

diff --git a/ACTSTracking/GeometryIdMappingTool.hxx b/ACTSTracking/GeometryIdMappingTool.hxx
@@ -19,10 +19,16 @@ namespace ACTSTracking {
  */
 class GeometryIdMappingTool {
  public:
+  enum class DetSchema : char { MuColl_v1, MuSIC_v1, MuSIC_v2 };
+
+  using modules_map = std::unordered_map<uint32_t, uint32_t>;
+  using det_mod_map = std::unordered_map<DetSchema, modules_map>;
+
   /** Create a mapping tool using the provided encoderString to
    * interpret cell ID's.
    */
-  GeometryIdMappingTool(const std::string& encoderString);
+  GeometryIdMappingTool(const std::string& encoderString,
+                        DetSchema dType = DetSchema::MuSIC_v1);
 
   /** Decode hit
    */
@@ -34,6 +40,7 @@ class GeometryIdMappingTool {
 
  private:
   std::string _encoderString;
+  const DetSchema det_type;
 
   static const std::unordered_map<int32_t, uint32_t> VolumeMap;
 
@@ -51,18 +58,16 @@ class GeometryIdMappingTool {
   static const int32_t OuterTrackerEndCapPositive;
 
   // Modules in phi ladder per layer
-  static const std::unordered_map<uint32_t, uint32_t> NLad_VertexBarrel;
-  static const std::unordered_map<uint32_t, uint32_t> NLad_InnerTrackerBarrel;
-  static const std::unordered_map<uint32_t, uint32_t>
-      NLad_OuterInnerTrackerBarrel;
-  static const std::unordered_map<uint32_t, uint32_t> NLad_OuterTrackerBarrel;
+  static const det_mod_map NLad_VertexBarrel;
+  static const det_mod_map NLad_InnerTrackerBarrel;
+  static const det_mod_map NLad_OuterInnerTrackerBarrel;
+  static const det_mod_map NLad_OuterTrackerBarrel;
 
   // Modules in ring per layer
-  static const std::unordered_map<uint32_t, uint32_t> NRng_VertexEndCap;
-  static const std::unordered_map<uint32_t, uint32_t> NRng_InnerTrackerEndCap;
-  static const std::unordered_map<uint32_t, uint32_t>
-      NRng_OuterInnerTrackerEndCap;
-  static const std::unordered_map<uint32_t, uint32_t> NRng_OuterTrackerEndCap;
+  static const det_mod_map NRng_VertexEndCap;
+  static const det_mod_map NRng_InnerTrackerEndCap;
+  static const det_mod_map NRng_OuterInnerTrackerEndCap;
+  static const det_mod_map NRng_OuterTrackerEndCap;
 };
 
 }  // namespace ACTSTracking
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -1,9 +1,9 @@
 # Tracking geometry
-INSTALL(FILES MuColl_v1.root
+INSTALL(FILES MuColl_v1.root MuSIC_v1.root MuSIC_v2.root
   DESTINATION ${CMAKE_INSTALL_DATADIR}/ACTSTracking/data)
 
 # Geometry description
-INSTALL(FILES MuColl_v1.json
+INSTALL(FILES MuColl_v1.json MuSIC_v1.json MuSIC_v2.json
   DESTINATION ${CMAKE_INSTALL_DATADIR}/ACTSTracking/data)
 
 # Material map

diff --git a/data/MuSIC_v1.json b/data/MuSIC_v1.json
@@ -0,0 +1,307 @@
+{
+    "geo-tgeo-unit-scalor": 10.0,
+    "geo-tgeo-build-beampipe": false,
+    "geo-tgeo-beampipe-parameters": [
+	0.0,
+	0.0,
+	0.0
+    ],
+    "Volumes": [
+	{
+	    "geo-tgeo-volume-name": "Vertex",
+	    "geo-tgeo-sfbin-r-tolerance": {
+		"lower": 5.0,
+		"upper": 5.0
+	    },
+	    "geo-tgeo-sfbin-z-tolerance": {
+		"lower": 5.0,
+		"upper": 5.0
+	    },
+	    "geo-tgeo-sfbin-phi-tolerance": {
+		"lower": 0.025,
+		"upper": 0.025
+	    },
+	    "geo-tgeo-volume-layers": {
+		"negative": true,
+		"central": true,
+		"positive": true
+	    },
+	    "geo-tgeo-subvolume-names": {
+		"negative": "VertexEndcap*",
+		"central": "VertexBarrel*",
+		"positive": "VertexEndcap*"
+	    },
+	    "geo-tgeo-sensitive-names": {
+		"negative": ["sensor*"],
+		"central": ["VertexBarrel_layer*_sens"],
+		"positive": ["sensor*"]
+	    },
+	    "geo-tgeo-sensitive-axes": {
+		"negative": "xZy",
+		"central": "YZX",
+		"positive": "xZy"
+	    },
+	    "geo-tgeo-layer-r-ranges": {
+		"negative": {
+		    "lower": 0.0,
+		    "upper": 120.0
+		},
+		"central": {
+		    "lower": 0.0,
+		    "upper": 120.0
+		},
+		"positive": {
+		    "lower": 0.0,
+		    "upper": 120.0
+		}
+	    },
+	    "geo-tgeo-layer-z-ranges": {
+		"negative": {
+		    "lower": -405.0,
+		    "upper": -150.0
+		},
+		"central": {
+		    "lower": -150.0,
+		    "upper": 150.0
+		},
+		"positive": {
+		    "lower": 150.0,
+		    "upper": 405.0
+		}
+	    },
+	    "geo-tgeo-layer-r-split": {
+		"negative": -1.0,
+		"central": 0.1,
+		"positive": -1.0
+	    },
+	    "geo-tgeo-layer-z-split": {
+		"negative": 1.0,
+		"central": -1.0,
+		"positive": 1.0
+	    },
+	    "geo-tgeo-cyl-disc-split": false
+	},
+	{
+	    "geo-tgeo-volume-name": "InnerTrackers",
+	    "geo-tgeo-sfbin-r-tolerance": {
+		"lower": 5.0,
+		"upper": 5.0
+	    },
+	    "geo-tgeo-sfbin-z-tolerance": {
+		"lower": 5.0,
+		"upper": 5.0
+	    },
+	    "geo-tgeo-sfbin-phi-tolerance": {
+		"lower": 0.025,
+		"upper": 0.025
+	    },
+	    "geo-tgeo-volume-layers": {
+		"negative": true,
+		"central": true,
+		"positive": true
+	    },
+	    "geo-tgeo-subvolume-names": {
+		"negative": "InnerTrackerEndcap*",
+		"central": "InnerTrackerBarrel*",
+		"positive": "InnerTrackerEndcap*"
+	    },
+	    "geo-tgeo-sensitive-names": {
+		"negative": ["sensor*"],
+		"central": ["sensor*"],
+		"positive": ["sensor*"]
+	    },
+	    "geo-tgeo-sensitive-axes": {
+		"negative": "XYZ",
+		"central": "XYZ",
+		"positive": "XYZ"
+	    },
+	    "geo-tgeo-layer-r-ranges": {
+		"negative": {
+		    "lower": 50.0,
+		    "upper": 500.0
+		},
+		"central": {
+		    "lower": 120.0,
+		    "upper": 500.0
+		},
+		"positive": {
+		    "lower": 50.0,
+		    "upper": 500.0
+		}
+	    },
+	    "geo-tgeo-layer-z-ranges": {
+		"negative": {
+		    "lower": -650.0,
+		    "upper": -500.0
+		},
+		"central": {
+		    "lower": -500.0,
+		    "upper": 500.0
+		},
+		"positive": {
+		    "lower": 500.0,
+		    "upper": 650.0
+		}
+	    },
+	    "geo-tgeo-layer-r-split": {
+		"negative": -1.0,
+		"central": 10,
+		"positive": -1.0
+	    },
+	    "geo-tgeo-layer-z-split": {
+		"negative": 10.0,
+		"central": -1.0,
+		"positive": 10.0
+	    },
+	    "geo-tgeo-cyl-disc-split": false
+	},
+	{
+	    "geo-tgeo-volume-name": "OuterInnerTrackers",
+	    "geo-tgeo-sfbin-r-tolerance": {
+		"lower": 5.0,
+		"upper": 5.0
+	    },
+	    "geo-tgeo-sfbin-z-tolerance": {
+		"lower": 5.0,
+		"upper": 5.0
+	    },
+	    "geo-tgeo-sfbin-phi-tolerance": {
+		"lower": 0.025,
+		"upper": 0.025
+	    },
+	    "geo-tgeo-volume-layers": {
+		"negative": true,
+		"central": true,
+		"positive": true
+	    },
+	    "geo-tgeo-subvolume-names": {
+		"negative": "InnerTrackerEndcap*",
+		"central": "InnerTrackerBarrel*",
+		"positive": "InnerTrackerEndcap*"
+	    },
+	    "geo-tgeo-sensitive-names": {
+		"negative": ["sensor*"],
+		"central": ["sensor*"],
+		"positive": ["sensor*"]
+	    },
+	    "geo-tgeo-sensitive-axes": {
+		"negative": "XYZ",
+		"central": "XYZ",
+		"positive": "XYZ"
+	    },
+	    "geo-tgeo-layer-r-ranges": {
+		"negative": {
+		    "lower": 120.0,
+		    "upper": 600.0
+		},
+		"central": {
+		    "lower": 500.0,
+		    "upper": 600.0
+		},
+		"positive": {
+		    "lower": 120.0,
+		    "upper": 600.0
+		}
+	    },
+	    "geo-tgeo-layer-z-ranges": {
+		"negative": {
+		    "lower": -2210.0,
+		    "upper": -750.0
+		},
+		"central": {
+		    "lower": -750.0,
+		    "upper": 750.0
+		},
+		"positive": {
+		    "lower": 750.0,
+		    "upper": 2210.0
+		}
+	    },
+	    "geo-tgeo-layer-r-split": {
+		"negative": -1.0,
+		"central": 10,
+		"positive": -1.0
+	    },
+	    "geo-tgeo-layer-z-split": {
+		"negative": 10.0,
+		"central": -1.0,
+		"positive": 10.0
+	    },
+	    "geo-tgeo-cyl-disc-split": false
+	},
+	{
+	    "geo-tgeo-volume-name": "OuterTrackers",
+	    "geo-tgeo-sfbin-r-tolerance": {
+		"lower": 5.0,
+		"upper": 5.0
+	    },
+	    "geo-tgeo-sfbin-z-tolerance": {
+		"lower": 5.0,
+		"upper": 5.0
+	    },
+	    "geo-tgeo-sfbin-phi-tolerance": {
+		"lower": 0.025,
+		"upper": 0.025
+	    },
+	    "geo-tgeo-volume-layers": {
+		"negative": true,
+		"central": true,
+		"positive": true
+	    },
+	    "geo-tgeo-subvolume-names": {
+		"negative": "OuterTrackerEndcap*",
+		"central": "OuterTrackerBarrel*",
+		"positive": "OuterTrackerEndcap*"
+	    },
+	    "geo-tgeo-sensitive-names": {
+		"negative": ["sensor*"],
+		"central": ["sensor*"],
+		"positive": ["sensor*"]
+	    },
+	    "geo-tgeo-sensitive-axes": {
+		"negative": "XYZ",
+		"central": "XYZ",
+		"positive": "XYZ"
+	    },
+	    "geo-tgeo-layer-r-ranges": {
+		"negative": {
+		    "lower": 570.0,
+		    "upper": 1550.0
+		},
+		"central": {
+		    "lower": 600.0,
+		    "upper": 1550.0
+		},
+		"positive": {
+		    "lower": 570.0,
+		    "upper": 1550.0
+		}
+	    },
+	    "geo-tgeo-layer-z-ranges": {
+		"negative": {
+		    "lower": -2210.0,
+		    "upper": -1300.0
+		},
+		"central": {
+		    "lower": -1300.0,
+		    "upper": 1300.0
+		},
+		"positive": {
+		    "lower": 1300.0,
+		    "upper": 2210.0
+		}
+	    },
+	    "geo-tgeo-layer-r-split": {
+		"negative": -1.0,
+		"central": 10,
+		"positive": -1.0
+	    },
+	    "geo-tgeo-layer-z-split": {
+		"negative": 10.0,
+		"central": -1.0,
+		"positive": 10.0
+	    },
+	    "geo-tgeo-cyl-disc-split": false
+	}
+    ]
+}
diff --git a/data/MuSIC_v1.root b/data/MuSIC_v1.root