Skip to content

Commit

Permalink
added MuSIC_v2 files for mapping, adapted code to include MuSIC_v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Davide Zuliani INFN Padova - PostDoc committed Oct 2, 2024
1 parent 9eb70f8 commit db7cd63
Show file tree
Hide file tree
Showing 5 changed files with 327 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ACTSTracking/GeometryIdMappingTool.hxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace ACTSTracking {
*/
class GeometryIdMappingTool {
public:
enum class DetSchema : char { MuColl_v1, MuSIC_v1 };
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>;
Expand Down
307 changes: 307 additions & 0 deletions data/MuSIC_v2.json
View file
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Binary file added data/MuSIC_v2.root
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion src/ACTSProcBase.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ void ACTSProcBase::init() {
<< " -------------------------------------" << std::endl;

// Initialize mapping tool
DetSchema dSchema = DetSchema::MuSIC_v1;
DetSchema dSchema = DetSchema::MuSIC_v2; // default configuration is MuSIC_v2
if (_detSchema == "MuSIC_v1") dSchema = DetSchema::MuSIC_v1;
if (_detSchema == "MuColl_v1") dSchema = DetSchema::MuColl_v1;

_geoIDMappingTool = std::make_shared<GeometryIdMappingTool>(
Expand Down
21 changes: 17 additions & 4 deletions src/GeometryIdMappingTool.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,49 +23,62 @@ const det_mod_map GeometryIdMappingTool::NLad_VertexBarrel = {
{ GeometryIdMappingTool::DetSchema::MuColl_v1, {
{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}, {7, 5}} },
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, {
{0, 5}, {2, 5}, {4, 5}, {6, 5}} }
{0, 5}, {2, 5}, {4, 5}, {6, 5}} },
{ GeometryIdMappingTool::DetSchema::MuSIC_v2, {
{0, 5}, {2, 5}, {4, 5}, {6, 5}, {8, 5}} },
};

const det_mod_map GeometryIdMappingTool::NRng_VertexEndCap = {
{ GeometryIdMappingTool::DetSchema::MuColl_v1, {
{0, 16}, {1, 16}, {2, 16}, {3, 16}, {4, 16}, {5, 16}, {6, 16}, {7, 16}} },
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, {
{0, 16}, {2, 16}, {4, 16}, {6,16} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v2, {
{0, 16}, {2, 16}, {4, 16}, {6,16} } }
};

const det_mod_map GeometryIdMappingTool::NLad_InnerTrackerBarrel = {
{ GeometryIdMappingTool::DetSchema::MuColl_v1, { {0, 32}, {1, 32} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, { {0, 32}, {1, 32} } }
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, { {0, 32}, {1, 32} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v2, { {0, 32}, {1, 32} } }
};

const det_mod_map GeometryIdMappingTool::NRng_InnerTrackerEndCap = {
{ GeometryIdMappingTool::DetSchema::MuColl_v1, { {0, 26} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, { {0, 26} } }
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, { {0, 26} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v2, { {0, 26} } }
};

const det_mod_map GeometryIdMappingTool::NLad_OuterInnerTrackerBarrel = {
{ GeometryIdMappingTool::DetSchema::MuColl_v1, { {2, 46} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, { {2, 46} } }
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, { {2, 46} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v2, { {2, 46} } }
};

const det_mod_map GeometryIdMappingTool::NRng_OuterInnerTrackerEndCap = {
{ GeometryIdMappingTool::DetSchema::MuColl_v1, {
{1, 26}, {2, 26}, {3, 26}, {4, 26}, {5, 26}, {6, 26} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, {
{1, 26}, {2, 26}, {3, 26}, {4, 26}, {5, 26}, {6, 26} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v2, {
{1, 26}, {2, 26}, {3, 26}, {4, 26}, {5, 26}, {6, 26} } }
};

const det_mod_map GeometryIdMappingTool::NLad_OuterTrackerBarrel = {
{ GeometryIdMappingTool::DetSchema::MuColl_v1, {
{0, 84}, {1, 84}, {2, 84} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, {
{0, 84}, {1, 84}, {2, 84} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v2, {
{0, 84}, {1, 84}, {2, 84} } }
};

const det_mod_map GeometryIdMappingTool::NRng_OuterTrackerEndCap = {
{ GeometryIdMappingTool::DetSchema::MuColl_v1, {
{0, 48}, {1, 48}, {2, 48}, {3, 48}, {4, 48}, {5, 48}, {6, 48}, {7, 48} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v1, {
{0, 48}, {1, 48}, {2, 48}, {3, 48}, {4, 48}, {5, 48}, {6, 48}, {7, 48} } },
{ GeometryIdMappingTool::DetSchema::MuSIC_v2, {
{0, 48}, {1, 48}, {2, 48}, {3, 48}, {4, 48}, {5, 48}, {6, 48}, {7, 48} } }
};

Expand Down

0 comments on commit db7cd63

Please sign in to comment.