Merge pull request #14 from rlcee/up_250102

Minor updates and start DQM

packages/dqm/package.py

@@ -0,0 +1,53 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+import os
+from pathlib import Path
+from spack.package import *
+
+
+class Dqm(CMakePackage):
+    """The Mu2e Offline Data Quality Monitor"""
+
+    homepage = "https://mu2e.fnal.gov"
+    git = "https://github.com/Mu2e/DQM"
+    url = "https://github.com/Mu2e/DQM/archive/refs/tags/0.1.0.tar.gz"
+
+    maintainers("tedeschi","rlcee")
+
+    license("Apache-2.0")
+
+    version("main", branch="main", get_full_repo=True)
+    version("develop", branch="main", get_full_repo=True)
+    version("0.1.0", sha256="")
+
+    variant(
+        "cxxstd",
+        default="20",
+        values=("14", "17", "20"),
+        multi=False,
+        sticky=True,
+        description="Use the specified C++ standard when building.",
+    )
+
+    # Direct dependencies
+    depends_on("Offline")
+
+    def cmake_args(self):
+        args = [
+            self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd"),
+        ]
+        if os.path.exists("CMakePresets.cmake"):
+            args.extend(["--preset", "default"])
+        else:
+            self.define("artdaq_core_OLD_STYLE_CONFIG_VARS", True)
+        return args
+
+    def setup_run_environment(self, env):
+        prefix = self.prefix
+        # Ensure we can find plugin libraries.
+        env.prepend_path("CET_PLUGIN_PATH", prefix.lib)
+        # Ensure we can find fhicl files
+        env.prepend_path("FHICL_FILE_PATH", prefix + "/fcl")

packages/kinkal/package.py

@@ -13,12 +13,11 @@ class Kinkal(CMakePackage):
     url = "https://github.com/KFTrack/KinKal/archive/refs/tags/v2.4.2.tar.gz"
     git = "https://github.com/KFTrack/KinKal"
 
-    # notify when the package is updated.
-    # maintainers("github_user1", "github_user2")
-    maintainers = ['mengel']
+    maintainers = ['brownd1978','rlcee']
 
     version("main", branch="main", get_full_repo=True)
 
+    version("3.1.5", sha256="5a964a0a88a7b55b277524d4280c8b428841f6953e9b133adc1dd2f9e9bb1a17")
     version("3.1.4", sha256="04492cae4b473e75e4240ff76c590e6f0a7f9528da367e74b2041cf9c4b0fef2")
     version("3.1.3", sha256="7b465f7e788d42a5f0310dc31a38b32161ebe582fdc6f0ee178439b12e172fc6")
     version("3.1.2", sha256="4417844e7885825f1c51f23fa69312192a5bb6918aa43553d307b81b2347962f")

packages/mdh/package.py

@@ -15,6 +15,7 @@ class Mdh(Package):
     git = "https://github.com/Mu2e/mdh.git"
     maintainers = ["rlcee", "kutschke"]
 
+    version("1.8.0", sha256="925b3cbd86b4264fcfd745f70f4dbe2392ea49f6c433eadfa303815e3af7d410")
     version("1.7.0", sha256="aa92f1fde4d627871992f59f3ea4ec0b5f6a0cdcae94ef923bd6602a743a0874")
     version("1.6.0", sha256="776c9f2484065b32999b2b4e2501bbdce2f877ecd259ef2e02974a8d688f9271")
     version("1.5.0", sha256="9dd6934b7c322e0e51ea16a5aa7d8fe9d69401db9e4fb7c63377ac387d6c0fab")
@@ -47,5 +48,6 @@ def install(self, spec, prefix):
 
     def setup_run_environment(self, env):
         env.prepend_path("PATH", self.prefix.bin)
-        env.prepend_path("PYTHONPATH", "/usr/lib64/python3.9/site-packages")
+        if self.version < Version("1.6.0") :
+            env.prepend_path("PYTHONPATH", "/usr/lib64/python3.9/site-packages")
         env.prepend_path("PYTHONPATH", self.prefix + "/python")