From dc97ba45a47c07af7b80c0941a278aad01778482 Mon Sep 17 00:00:00 2001
From: Marilena Bandieramonte <marilena.bandieramonte@cern.ch>
Date: Thu, 16 Jun 2022 14:48:38 +0200
Subject: [PATCH] Code cleaning
---
FullSimLight/gmradiatiomaps.cc | 6 +-
.../include/RadMapsActionInitialization.hh | 2 +-
.../src/RadMapsActionInitialization.cc | 2 +-
FullSimLight/src/RadiationMapsMakerTool.cc | 56 +------------------
4 files changed, 4 insertions(+), 62 deletions(-)
diff --git a/FullSimLight/gmradiatiomaps.cc b/FullSimLight/gmradiatiomaps.cc
index 5bb634596..bf1105e98 100644
--- a/FullSimLight/gmradiatiomaps.cc
+++ b/FullSimLight/gmradiatiomaps.cc
@@ -138,10 +138,6 @@ int main(int argc, char** argv) {
radMapsAct->SetCreateElementsMaps(parCreateElementsMaps);
runManager->SetUserInitialization(radMapsAct);
- // 3. User action
-// FSLActionInitialization* FSLAct = new FSLActionInitialization(parIsPerformance);
-// runManager->SetUserInitialization(FSLAct);
-
// 4. Run the simulation in batch mode
G4UImanager* UI = G4UImanager::GetUIpointer();
@@ -185,7 +181,7 @@ void Help() {
<< std::endl
<<" **** Parameters: \n\n"
<<" -g : [REQUIRED] the Geometry file name (supported extensions: .db/.gdml/.dylib/.so) \n"
- <<" -m : [OPTIONAL] the standard Geant4 macro file name (default: 'geantino.g4') \n"
+ <<" -m : [OPTIONAL] the standard Geant4 macro file name (default: 'radiationMaps.g4') \n"
<<" -r : [OPTIONAL] r limit for maps in mm (default: '12500') \n"
<<" -z : [OPTIONAL] z limit for maps in mm (default: '23000') \n"
<<" -x : [OPTIONAL] x limit for maps in mm (default: '12500') \n"
diff --git a/FullSimLight/include/RadMapsActionInitialization.hh b/FullSimLight/include/RadMapsActionInitialization.hh
index 1db3430d9..a2db81ac2 100644
--- a/FullSimLight/include/RadMapsActionInitialization.hh
+++ b/FullSimLight/include/RadMapsActionInitialization.hh
@@ -14,7 +14,7 @@ public:
virtual void Build() const;
void SetPerformanceModeFlag(bool val) { fIsPerformance = val; }
- void SetCreateGeantinoMaps (bool val) { fCreateRadiationMaps = val; }
+ void SetCreateRadiationMaps (bool val) { fCreateRadiationMaps = val; }
void SetCreateEtaPhiMaps (bool val) { fCreateEtaPhiMaps = val; }
void SetCreateDetectorsMaps(bool val) { fCreateDetectorsMaps = val; }
void SetCreateMaterialsMaps(bool val) { fCreateMaterialsMaps = val; }
diff --git a/FullSimLight/src/RadMapsActionInitialization.cc b/FullSimLight/src/RadMapsActionInitialization.cc
index cde53f526..6407b27f5 100644
--- a/FullSimLight/src/RadMapsActionInitialization.cc
+++ b/FullSimLight/src/RadMapsActionInitialization.cc
@@ -47,7 +47,7 @@ void RadMapsActionInitialization::Build() const {
// in sequential mode the BuildForMaster method is not called:
// - create the only one run action with perfomance flag true i.e. only time is measured
if (fIsPerformance) {
- FSLRunAction* masterRunAct = new FSLRunAction(fCreateGeantinoMaps, fGeantinoMapsFilename);
+ FSLRunAction* masterRunAct = new FSLRunAction(fCreateRadiationMaps, fRadiationMapsFilename);
masterRunAct->SetPerformanceFlag(fIsPerformance);
SetUserAction(masterRunAct);
}
diff --git a/FullSimLight/src/RadiationMapsMakerTool.cc b/FullSimLight/src/RadiationMapsMakerTool.cc
index 32279d9c7..5e9f7cb5c 100644
--- a/FullSimLight/src/RadiationMapsMakerTool.cc
+++ b/FullSimLight/src/RadiationMapsMakerTool.cc
@@ -12,61 +12,7 @@ namespace G4UA{
RadiationMapsMakerTool::RadiationMapsMakerTool(const std::string& ,
const std::string& )
:m_radMapsFileName("RadMaps.root")
- {
-// /// Output Filename for the Radiation Maps
-// declareProperty("RadMapsFileName", m_radMapsFileName);
-// /// Name of the material to make radiation maps for (take all if empty)
-// declareProperty("Material" , m_config.material);
-// /// If true consider hits with y>0 only -- useful for shafts
-// declareProperty("PositiveYOnly" , m_config.posYOnly);
-// /// map granularities
-// /// number of bins in r and z for all 2D maps
-// declareProperty("NBinsR" , m_config.nBinsr);
-// declareProperty("NBinsZ" , m_config.nBinsz);
-// /// number of bins in logE for energy spectra of neutrons in 2D grids
-// declareProperty("NBinsLogEn" , m_config.nBinslogEn);
-// /// number of bins in logE for energy spectra of other particles in 2D grids
-// declareProperty("NBinsLogEo" , m_config.nBinslogEo);
-// /// number of bins in dphi for dphi x theta dependent energy spectra
-// declareProperty("NBinsDPhi" , m_config.nBinsdphi);
-// /// number of bins in theta for dphi x theta dependent energy spectra
-// declareProperty("NBinsTheta" , m_config.nBinstheta);
-// /// number of bins in r, z and phi for all 3D maps
-// declareProperty("NBinsR3D" , m_config.nBinsr3d);
-// declareProperty("NBinsZ3D" , m_config.nBinsz3d);
-// declareProperty("NBinsPhi3D" , m_config.nBinsphi3d);
-// /// number of bins in logTimeCut for time dependent TID 2D maps
-// declareProperty("NBinsLogTimeCut", m_config.nBinslogT);
-// /// map ranges
-// /// for Zoomed area in 2D and 3D
-// declareProperty("RMinZoom" , m_config.rMinZoom);
-// declareProperty("RMaxZoom" , m_config.rMaxZoom);
-// declareProperty("ZMinZoom" , m_config.zMinZoom);
-// declareProperty("ZMaxZoom" , m_config.zMaxZoom);
-// /// for Full detector in 2D
-// declareProperty("RMinFull" , m_config.rMinFull);
-// declareProperty("RMaxFull" , m_config.rMaxFull);
-// declareProperty("ZMinFull" , m_config.zMinFull);
-// declareProperty("ZMaxFull" , m_config.zMaxFull);
-// /// for Zoomed area in 3D
-// declareProperty("PhiMinZoom" , m_config.phiMinZoom);
-// declareProperty("PhiMaxZoom" , m_config.phiMaxZoom);
-// /// for logE of neutrons in 2D spectra
-// declareProperty("LogEMinn" , m_config.logEMinn);
-// declareProperty("LogEMaxn" , m_config.logEMaxn);
-// /// for logE of other particles in 2D spectra
-// declareProperty("LogEMino" , m_config.logEMino);
-// declareProperty("LogEMaxo" , m_config.logEMaxo);
-// /// for Theta in 2D spectra
-// declareProperty("ThetaMin" , m_config.thetaMin);
-// declareProperty("ThetaMax" , m_config.thetaMax);
-// /// for logT in time-dependent TID 2D maps
-// declareProperty("LogTMin" , m_config.logTMin);
-// declareProperty("LogTMax" , m_config.logTMax);
-// /// for elements mass fracion 2D maps
-// declareProperty("ElemZMin" , m_config.elemZMin);
-// declareProperty("ElemZMax" , m_config.elemZMax);
- }
+ {}
//---------------------------------------------------------------------------
// Initialize Configurable Properties
--
GitLab