Skip to content

Add MAIA schema #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madbaron merged 6 commits into from
Nov 29, 2024
Merged

Add MAIA schema #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd97bda
adding MAIA
Nov 27, 2024
35ffb9f
adding MAIA
Nov 27, 2024
7c50c9b
remove couts
Nov 27, 2024
2f31379
final cleanup
Nov 28, 2024
65af012
fix layer ID counting
Nov 29, 2024
2965645
applying Paolo's patch
Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ACTSTracking/GeometryIdMappingTool.hxx
View file
Open in desktop
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, MuSIC_v2 };
enum class DetSchema : char { MuColl_v1, MAIA_v0, 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 All @@ -28,7 +28,7 @@ class GeometryIdMappingTool {
* interpret cell ID's.
*/
GeometryIdMappingTool(const std::string& encoderString,
DetSchema dType = DetSchema::MuSIC_v1);
DetSchema dType = DetSchema::MuColl_v1);

/** Decode hit
*/
Expand Down
26 changes: 24 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,37 @@ PROJECT( ACTSTracking )

# project version
SET( ${PROJECT_NAME}_VERSION_MAJOR 1 )
SET( ${PROJECT_NAME}_VERSION_MINOR 1 )
SET( ${PROJECT_NAME}_VERSION_MINOR 3 )
SET( ${PROJECT_NAME}_VERSION_PATCH 0 )

### BUILD OPTIONS ###########################################################

set(PACKAGE_INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
set(PACKAGE_INSTALL_INC_DIR include CACHE PATH "Installation directory for headers")

### DEPENDENCIES ############################################################

FIND_PACKAGE( ILCUTIL REQUIRED COMPONENTS ILCSOFT_CMAKE_MODULES )

# load default settings from ILCSOFT_CMAKE_MODULES
INCLUDE( ilcsoft_default_settings )

FIND_PACKAGE( Marlin 1.0 REQUIRED ) # minimum required Marlin version
INCLUDE_DIRECTORIES( ${Marlin_INCLUDE_DIRS} )
LINK_LIBRARIES( ${Marlin_LIBRARIES} )
ADD_DEFINITIONS( ${Marlin_DEFINITIONS} )

FIND_PACKAGE( DD4hep REQUIRED COMPONENTS DDCore )
INCLUDE_DIRECTORIES( SYSTEM ${DD4hep_INCLUDE_DIRS} )
LINK_LIBRARIES( ${DD4hep_LIBRARIES} ${DD4hep_COMPONENT_LIBRARIES} )

FIND_PACKAGE( LCIO REQUIRED )
INCLUDE_DIRECTORIES( ${LCIO_INCLUDE_DIRS} )
LINK_LIBRARIES( ${LCIO_LIBRARIES} )

FIND_PACKAGE( ROOT REQUIRED)
INCLUDE_DIRECTORIES( ${ROOT_INCLUDE_DIRS} )
LINK_LIBRARIES( ${ROOT_LIBRARIES} )

FIND_PACKAGE( Acts REQUIRED COMPONENTS Core PluginJson PluginTGeo )

Expand All @@ -39,6 +58,7 @@ ADD_SUBDIRECTORY(data)
ADD_SUBDIRECTORY(example)

### LIBRARY #################################################################
ADD_DEFINITIONS( "-Wno-long-long -Wno-effc++ -Wno-unused-parameter -Wno-narrowing" )

# sources
CONFIGURE_FILE(src/config.h.in config.h)
Expand All @@ -58,7 +78,9 @@ TARGET_INCLUDE_DIRECTORIES(ACTSTracking
./ACTSTracking
${CMAKE_CURRENT_BINARY_DIR}
${Marlin_INCLUDE_DIRS}
${ROOT_INCLUDE_DIRS})
${ROOT_INCLUDE_DIRS}
${DD4hep_INCLUDE_DIRS}
${LCIO_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(ACTSTracking
${ROOT_LIBRARIES} DD4hep::DDCore
ActsCore ActsPluginTGeo ActsPluginJson)
Expand Down
6 changes: 3 additions & 3 deletions data/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Tracking geometry
INSTALL(FILES MuColl_v1.root MuSIC_v1.root MuSIC_v2.root
INSTALL(FILES MuColl_v1.root MuSIC_v1.root MuSIC_v2.root MAIA_v0.root
DESTINATION ${CMAKE_INSTALL_DATADIR}/ACTSTracking/data)

# Geometry description
INSTALL(FILES MuColl_v1.json MuSIC_v1.json MuSIC_v2.json
INSTALL(FILES MuColl_v1.json MuSIC_v1.json MuSIC_v2.json MAIA_v0.json
DESTINATION ${CMAKE_INSTALL_DATADIR}/ACTSTracking/data)

# Material map
INSTALL(FILES material-maps.json
INSTALL(FILES material-maps.json MAIA_v0_material.json
DESTINATION ${CMAKE_INSTALL_DATADIR}/ACTSTracking/data)
307 changes: 307 additions & 0 deletions data/MAIA_v0.json
View file
Open in desktop
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": -285.0,
"upper": -70.0
},
"central": {
"lower": -70.0,
"upper": 70.0
},
"positive": {
"lower": 70.0,
"upper": 285.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": -600.0,
"upper": -500.0
},
"central": {
"lower": -500.0,
"upper": 500.0
},
"positive": {
"lower": 500.0,
"upper": 600.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/MAIA_v0.root
View file
Open in desktop
Binary file not shown.
Loading