From 92a561e976f5f3ff5cdb38990ef2c6ab6f0449ff Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 19 Sep 2023 10:47:32 -0500
Subject: [PATCH] Apply all suggestions from code review

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 compact/tracking/definitions.xml            | 5 +++--
 compact/tracking/definitions_arches.xml     | 5 +++--
 compact/tracking/definitions_craterlake.xml | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/compact/tracking/definitions.xml b/compact/tracking/definitions.xml
index 9975cc3bc8..f3f2668d1f 100644
--- a/compact/tracking/definitions.xml
+++ b/compact/tracking/definitions.xml
@@ -174,12 +174,13 @@
   <plugins>
     <plugin name="epic_FileLoader">
       <arg value="cache:$DETECTOR_PATH:/opt/detector"/>
-      <arg value="file:calibrations/materials-map-brycecanyon.cbor"/>
+      <arg value="file:calibrations/material-map-brycecanyon.cbor"/>
       <arg value="url:https://eicweb.phy.anl.gov/EIC/detectors/athena/uploads/77bd16bef5d811f31256279a3601c9d5/material-maps.cbor"/>
     </plugin>
   </plugins>
   <define>
-    <constant name="materials-map" value="calibrations/materials-map-brycecanyon.cbor" type="string"/>
+    <constant name="materials-map" value="calibrations/material-map-brycecanyon.cbor" type="string"/><!-- EICrecon older than 1.6.0 -->
+    <constant name="material-map" value="calibrations/material-map-brycecanyon.cbor" type="string"/>
   </define>
 
 </lccdd>
diff --git a/compact/tracking/definitions_arches.xml b/compact/tracking/definitions_arches.xml
index 79482411bb..48e8bccc53 100644
--- a/compact/tracking/definitions_arches.xml
+++ b/compact/tracking/definitions_arches.xml
@@ -180,12 +180,13 @@
   <plugins>
     <plugin name="epic_FileLoader">
       <arg value="cache:$DETECTOR_PATH:/opt/detector"/>
-      <arg value="file:calibrations/materials-map-arches.cbor"/>
+      <arg value="file:calibrations/material-map-arches.cbor"/>
       <arg value="url:https://eicweb.phy.anl.gov/EIC/detectors/athena/uploads/77bd16bef5d811f31256279a3601c9d5/material-maps.cbor"/>
     </plugin>
   </plugins>
   <define>
-    <constant name="materials-map" value="calibrations/materials-map-arches.cbor" type="string"/>
+    <constant name="materials-map" value="calibrations/material-map-arches.cbor" type="string"/><!-- EICrecon older than 1.6.0 -->
+    <constant name="material-map" value="calibrations/material-map-arches.cbor" type="string"/>
   </define>
 
 </lccdd>
diff --git a/compact/tracking/definitions_craterlake.xml b/compact/tracking/definitions_craterlake.xml
index 79b15c4def..38be3539e2 100644
--- a/compact/tracking/definitions_craterlake.xml
+++ b/compact/tracking/definitions_craterlake.xml
@@ -195,12 +195,13 @@
   <plugins>
     <plugin name="epic_FileLoader">
       <arg value="cache:$DETECTOR_PATH:/opt/detector"/>
-      <arg value="file:calibrations/materials-map-craterlake.cbor"/>
+      <arg value="file:calibrations/material-map-craterlake.cbor"/>
       <arg value="url:https://eicweb.phy.anl.gov/EIC/detectors/athena/uploads/6253bfcb92dd6bc236dd9a06084614ba/material-maps.cbor"/>
     </plugin>
   </plugins>
   <define>
-    <constant name="materials-map" value="calibrations/materials-map-craterlake.cbor" type="string"/>
+    <constant name="materials-map" value="calibrations/material-map-craterlake.cbor" type="string"/><!-- EICrecon older than 1.6.0 -->
+    <constant name="material-map" value="calibrations/material-map-craterlake.cbor" type="string"/>
   </define>
 
 </lccdd>