Use versioned cross section paths in Example2

Harvard-Neutrino · Jan 24, 2024 · ef3af3c · ef3af3c
1 parent f3128b7
commit ef3af3c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/resources/Examples/Example2/DipolePortal_CCM.py b/resources/Examples/Example2/DipolePortal_CCM.py
@@ -6,6 +6,10 @@
 from leptoninjector import _util
 from leptoninjector.LIController import LIController
 
+import DarkNews
+
+darknews_version = _util.normalize_version(DarkNews.__version__)
+
 resources_dir = _util.resource_package_dir()
 
 # Define a DarkNews model
@@ -33,11 +37,10 @@
 # Particle to inject
 primary_type = LI.dataclasses.Particle.ParticleType.NuMu
 
+xs_path = _util.get_cross_section_model_path(f"DarkNewsTables-v{darknews_version}", must_exist=False)
 # Define DarkNews Model
 table_dir = os.path.join(
-    resources_dir,
-    "CrossSections",
-    "DarkNewsTables",
+    xs_path,
     "Dipole_M%2.2f_mu%2.2e" % (model_kwargs["m4"], model_kwargs["mu_tr_mu4"]),
 )
 controller.InputDarkNewsModel(primary_type, table_dir, model_kwargs)

diff --git a/resources/Examples/Example2/DipolePortal_MINERvA.py b/resources/Examples/Example2/DipolePortal_MINERvA.py
@@ -6,6 +6,10 @@
 from leptoninjector import _util
 from leptoninjector.LIController import LIController
 
+import DarkNews
+
+darknews_version = _util.normalize_version(DarkNews.__version__)
+
 resources_dir = _util.resource_package_dir()
 
 # Define a DarkNews model
@@ -33,11 +37,10 @@
 # Particle to inject
 primary_type = LI.dataclasses.Particle.ParticleType.NuMu
 
+xs_path = _util.get_cross_section_model_path(f"DarkNewsTables-v{darknews_version}", must_exist=False)
 # Define DarkNews Model
 table_dir = os.path.join(
-    resources_dir,
-    "CrossSectionTables",
-    "DarkNewsTables",
+    xs_path,
     "Dipole_M%2.2f_mu%2.2e" % (model_kwargs["m4"], model_kwargs["mu_tr_mu4"]),
 )
 controller.InputDarkNewsModel(primary_type, table_dir, model_kwargs)

diff --git a/resources/Examples/Example2/DipolePortal_MiniBooNE.py b/resources/Examples/Example2/DipolePortal_MiniBooNE.py
@@ -6,6 +6,12 @@
 
 resources_dir = _util.resource_package_dir()
 
+import DarkNews
+
+darknews_version = _util.normalize_version(DarkNews.__version__)
+
+resources_dir = _util.resource_package_dir()
+
 # Define a DarkNews model
 model_kwargs = {
     "m4": 0.47,  # 0.140,
@@ -31,11 +37,10 @@
 # Particle to inject
 primary_type = LI.dataclasses.Particle.ParticleType.NuMu
 
+xs_path = _util.get_cross_section_model_path(f"DarkNewsTables-v{darknews_version}", must_exist=False)
 # Define DarkNews Model
 table_dir = os.path.join(
-    resources_dir,
-    "CrossSectionTables",
-    "DarkNewsTables",
+    xs_path,
     "Dipole_M%2.2f_mu%2.2e" % (model_kwargs["m4"], model_kwargs["mu_tr_mu4"]),
 )
 controller.InputDarkNewsModel(primary_type, table_dir, model_kwargs)