diff --git a/schema/appmodel/PDS.schema.xml b/schema/appmodel/PDS.schema.xml index 6ef07b9..fff5799 100644 --- a/schema/appmodel/PDS.schema.xml +++ b/schema/appmodel/PDS.schema.xml @@ -80,7 +80,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -104,15 +104,16 @@ - - - + + - - - - + + + + + + @@ -150,6 +151,8 @@ + + @@ -166,6 +169,9 @@ + + + @@ -176,20 +182,10 @@ - - - - - - - - - - @@ -208,6 +204,10 @@ + + + + diff --git a/schema/appmodel/application.schema.xml b/schema/appmodel/application.schema.xml index b989837..7632cf5 100644 --- a/schema/appmodel/application.schema.xml +++ b/schema/appmodel/application.schema.xml @@ -80,7 +80,7 @@ - + @@ -172,6 +172,16 @@ + + + + + + + + + + @@ -230,6 +240,11 @@ + + + + + @@ -406,16 +421,6 @@ - - - - - - - - - - diff --git a/src/DaphneApplication.cpp b/src/DaphneApplication.cpp index 4ae92db..628eede 100644 --- a/src/DaphneApplication.cpp +++ b/src/DaphneApplication.cpp @@ -19,7 +19,6 @@ #include "ConfigObjectFactory.hpp" #include "appmodel/appmodelIssues.hpp" #include "appmodel/FelixDataSender.hpp" -#include "appmodel/DaphneConf.hpp" #include "appmodel/DaphneMapEntry.hpp" #include "appmodel/DaphneV2BoardConf.hpp" #include "appmodel/DaphneV2Channel.hpp" @@ -30,6 +29,7 @@ #include "appmodel/DaphneV2ControllerModule.hpp" #include "appmodel/DaphneV3ControllerModule.hpp" #include "appmodel/DaphneApplication.hpp" +#include "appmodel/DeferredConfig.hpp" #include "appmodel/FelixDetectorToDaqConnection.hpp" #include "appmodel/NetworkDetectorToDaqConnection.hpp" #include "appmodel/NWDetDataSender.hpp" @@ -63,12 +63,6 @@ DaphneApplication::generate_modules(std::shared_ptr conf_map; - auto confs = daphne_conf->get_boards(); - for ( const auto & c : confs ) { - conf_map[c->get_key()] = c->get_conf(); - } - // these maps are all indexed on the board id {detector].{crate}.{slot} std::map v3_map; std::map interfaces; @@ -181,15 +175,10 @@ DaphneApplication::generate_modules(std::shared_ptrsecond; conffwk::ConfigObject module_obj = obj_fac.create( (v3 ? "DaphneV3ControllerModule" : "DaphneV2ControllerModule"), fmt::format("controller-{}", id) ); module_obj.set_obj("daphne_conf", & daphne_conf -> config_object() ); - module_obj.set_obj("board_conf", & conf -> config_object() ); + module_obj.set_by_val("daphne_id", id); auto module = obj_fac.get_dal(module_obj); modules.push_back(module);