Skip to content

CHG: Removed old DEE modules from compilation procedure #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoglauer merged 2 commits into from
Jun 29, 2026
Merged

CHG: Removed old DEE modules from compilation procedure #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
823a5af
CHG: Removed old DEE modules from compilation procedure
zoglauer Jun 29, 2026
3959f09
CHG: Removed one file too much
zoglauer Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,16 @@ FRETALON_LIBS := $(addprefix $(LB)/,$(notdir $(FRETALON_CXX_FILES:.cxx=.
FRETALON_DEP_FILES := $(FRETALON_LIBS:.o=.d)

# Nuclearizer library
NUCLEARIZER := $(TOPLEVEL)
NUCLEARIZER_DIR := $(NUCLEARIZER)
NUCLEARIZER_PRG := $(BN)/nuclearizer
NUCLEARIZER_CXX_MAIN := $(NUCLEARIZER_DIR)/src/MNuclearizerMain.cxx
NUCLEARIZER_CXX_FILES := $(wildcard $(NUCLEARIZER_DIR)/src/*.cxx)
NUCLEARIZER_CXX_FILES := $(filter-out $(NUCLEARIZER_CXX_MAIN) $(NUCLEARIZER_DIR)/src/MModuleTemplate.cxx,$(NUCLEARIZER_CXX_FILES))
NUCLEARIZER_LIBS := $(addprefix $(LB)/,$(notdir $(NUCLEARIZER_CXX_FILES:.cxx=.o)))
NUCLEARIZER_DEP_FILES := $(NUCLEARIZER_LIBS:.o=.d)
NUCLEARIZER_H_FILES := $(addprefix $(NUCLEARIZER)/include/,$(notdir $(NUCLEARIZER_LIBS:.o=.h)))
NUCLEARIZER := $(TOPLEVEL)
NUCLEARIZER_DIR := $(NUCLEARIZER)
NUCLEARIZER_PRG := $(BN)/nuclearizer
NUCLEARIZER_CXX_MAIN := $(NUCLEARIZER_DIR)/src/MNuclearizerMain.cxx
NUCLEARIZER_CXX_FILTERED := $(NUCLEARIZER_CXX_MAIN) $(NUCLEARIZER_DIR)/src/MModuleTemplate.cxx $(NUCLEARIZER_DIR)/src/MDetectorEffectsEngineSingleDet.cxx $(NUCLEARIZER_DIR)/src/MDetectorEffectsEngineSMEX.cxx $(NUCLEARIZER_DIR)/src/MModuleLoaderSimulationsSingleDet.cxx $(NUCLEARIZER_DIR)/src/MModuleLoaderSimulationsSMEX.cxx $(NUCLEARIZER_DIR)/src/MGUIOptionsLoaderSimulations.cxx
NUCLEARIZER_CXX_FILES := $(wildcard $(NUCLEARIZER_DIR)/src/*.cxx)
NUCLEARIZER_CXX_FILES := $(filter-out $(NUCLEARIZER_CXX_FILTERED),$(NUCLEARIZER_CXX_FILES))
NUCLEARIZER_LIBS := $(addprefix $(LB)/,$(notdir $(NUCLEARIZER_CXX_FILES:.cxx=.o)))
NUCLEARIZER_DEP_FILES := $(NUCLEARIZER_LIBS:.o=.d)
NUCLEARIZER_H_FILES := $(addprefix $(NUCLEARIZER)/include/,$(notdir $(NUCLEARIZER_LIBS:.o=.h)))

# Nuclearizer dictionary
NUCLEARIZER_DICT_NAME=Nuclearizer_Dictionary
Expand Down
4 changes: 0 additions & 4 deletions src/MAssembly.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ using namespace std;
#include "MModule.h"
#include "MGUIExpoCombinedViewer.h"
#include "MModuleTransmitterRealta.h"
#include "MModuleLoaderSimulationsSMEX.h"
#include "MModuleLoaderSimulationsSingleDet.h"
#include "MModuleLoaderSimulationsCosima.h"
#include "MModuleLoaderMeasurementsROA.h"
#include "MModuleLoaderMeasurementsHDF.h"
Expand Down Expand Up @@ -123,8 +121,6 @@ MAssembly::MAssembly()

m_Supervisor->UseMultiThreading(true);

m_Supervisor->AddAvailableModule(new MModuleLoaderSimulationsSMEX());
m_Supervisor->AddAvailableModule(new MModuleLoaderSimulationsSingleDet());
m_Supervisor->AddAvailableModule(new MModuleLoaderSimulationsCosima());
m_Supervisor->AddAvailableModule(new MModuleLoaderMeasurementsROA());
m_Supervisor->AddAvailableModule(new MModuleLoaderMeasurementsHDF());
Expand Down
Loading