fixing handler to read from directory not matching experiment name

Author: jholloc

…ple_mapper/mappings/example/globals.json …_mapper/mappings/example_v1/globals.jsonlibtokamap/examples/simple_mapper/mappings/example/globals.json renamed to libtokamap/examples/simple_mapper/mappings/example_v1/globals.json libtokamap/examples/simple_mapper/mappings/example/globals.json renamed to libtokamap/examples/simple_mapper/mappings/example_v1/globals.json

@@ -3,11 +3,8 @@
   "$id": "/schemas/toplevel",
   "description": "JSON Schema for v1.0 of mapping globals",
   "type": "object",
-  "patternProperties": {
-    "^((?!DATA_SOURCE_CONFIG).)*$": {
-      "type": "string"
-    },
-    "^DATA_SOURCE_CONFIG$": {
+  "properties": {
+    "DATA_SOURCE_CONFIG": {
       "type": "object",
       "patternProperties": {
         "^.*$": {
@@ -16,7 +13,7 @@
       }
     }
   },
-  "additionalProperties": false,
+  "additionalProperties": true,
   "$defs": {
     "args": {
       "patternProperties": {

…ppings/example/magnetics/40/globals.json …ngs/example_v1/magnetics/40/globals.jsonlibtokamap/examples/simple_mapper/mappings/example/magnetics/40/globals.json renamed to libtokamap/examples/simple_mapper/mappings/example_v1/magnetics/40/globals.json libtokamap/examples/simple_mapper/mappings/example/magnetics/40/globals.json renamed to libtokamap/examples/simple_mapper/mappings/example_v1/magnetics/40/globals.json

@@ -138,7 +138,7 @@ load_mapping_config(const std::filesystem::path& mapping_dir, const valijson::Sc
     auto partition_list = mapping_config["partitions"].get<std::vector<libtokamap::MappingPartition>>();
     auto groups = mapping_config["groups"].get<std::vector<libtokamap::GroupName>>();
 
-    libtokamap::ExperimentMappings experiment_mappings{partition_list, groups};
+    libtokamap::ExperimentMappings experiment_mappings{partition_list, groups, mapping_dir};
     return {metadata.experiment, std::move(experiment_mappings)};
 }
 
@@ -441,14 +441,16 @@ void libtokamap::MappingHandler::load_experiment(const ExperimentName& experimen
 
     auto& experiment_mapping = m_experiment_register[experiment];
 
-    auto top_level_globals = load_json(m_mapping_dir / experiment / "globals.json", m_globals_schema);
+    const auto& mapping_dir = experiment_mapping.root_path;
+
+    auto top_level_globals = load_json(mapping_dir / "globals.json", m_globals_schema);
     validate(top_level_globals, m_globals_schema);
     experiment_mapping.top_level_globals = top_level_globals;
 
     auto& partition_list = experiment_mapping.partition_list;
 
     for (const auto& group_name : experiment_mapping.groups) {
-        auto group_directory = m_mapping_dir / experiment / group_name;
+        auto group_directory = mapping_dir / group_name;
         auto partition_directory = find_partition_directory(group_directory, partition_list, attributes);
         auto partition_attributes = find_partition_attributes(partition_list, attributes);
 

…pings/example/magnetics/40/mappings.json …gs/example_v1/magnetics/40/mappings.jsonlibtokamap/examples/simple_mapper/mappings/example/magnetics/40/mappings.json renamed to libtokamap/examples/simple_mapper/mappings/example_v1/magnetics/40/mappings.json libtokamap/examples/simple_mapper/mappings/example/magnetics/40/mappings.json renamed to libtokamap/examples/simple_mapper/mappings/example_v1/magnetics/40/mappings.json

@@ -73,10 +73,11 @@ struct ExperimentMappings {
     std::vector<GroupName> groups;
     GroupMappings group_mappings;
     nlohmann::json top_level_globals;
+    std::filesystem::path root_path;
 
     ExperimentMappings() = default;
-    ExperimentMappings(PartitionList partition_list, std::vector<GroupName> groups)
-        : partition_list(std::move(partition_list)), groups(std::move(groups))
+    ExperimentMappings(PartitionList partition_list, std::vector<GroupName> groups, std::filesystem::path root_path)
+        : partition_list(std::move(partition_list)), groups(std::move(groups)), root_path(std::move(root_path))
     {
     }
     ExperimentMappings(const ExperimentMappings& other) = delete;
@@ -88,6 +89,7 @@ struct ExperimentMappings {
         std::swap(groups, other.groups);
         std::swap(group_mappings, other.group_mappings);
         std::swap(top_level_globals, other.top_level_globals);
+        std::swap(root_path, other.root_path);
     }
     ExperimentMappings& operator=(ExperimentMappings&& other) noexcept
     {
@@ -96,6 +98,7 @@ struct ExperimentMappings {
         std::swap(groups, other.groups);
         std::swap(group_mappings, other.group_mappings);
         std::swap(top_level_globals, other.top_level_globals);
+        std::swap(root_path, other.root_path);
         return *this;
     }
     ~ExperimentMappings() = default;