diff --git a/NPLib/CMakeLists.txt b/NPLib/CMakeLists.txt
index e4a77e6eca82127049b9d464ac4f43286db631bc..7d54fcd7ca875a2b8a4c2d909331265e4d30ea76 100644
--- a/NPLib/CMakeLists.txt
+++ b/NPLib/CMakeLists.txt
@@ -7,7 +7,8 @@ set(CMAKE_BUILD_TYPE Release)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
# include the nptool standard CMake preamble
-include("ressources/CMake/NPTool_CMake_Preamble.cmake")
+include("${CMAKE_BINARY_DIR}/ressources/CMake/NPTool_CMake_Preamble.cmake")
+
# Major change in the Core/Physics (affecting the detector/analysis/simulation)
set(NPLIB_VERSION_MAJOR 2)
diff --git a/NPLib/Calibration/CMakeLists.txt b/NPLib/Calibration/CMakeLists.txt
index 5f78fd6c32576fb16ed94cbf55431e22624cbf9f..11537d6c02978c8303c373f77259a3b057d81bce 100644
--- a/NPLib/Calibration/CMakeLists.txt
+++ b/NPLib/Calibration/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT NPSiliconCalibratorDict.cxx COMMAND ../scripts/build_dict.sh NPSiliconCalibrator.h NPSiliconCalibratorDict.cxx NPSiliconCalibrator.rootmap libNPCalibration.so NPCalibrationLinkDef1.h)
-add_custom_command(OUTPUT NPCalibrationSourceDict.cxx COMMAND ../scripts/build_dict.sh NPCalibrationSource.h NPCalibrationSourceDict.cxx NPCalibrationSource.rootmap libNPCalibration.so NPCalibrationLinkDef2.h)
+add_custom_command(OUTPUT NPSiliconCalibratorDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPSiliconCalibrator.h NPSiliconCalibratorDict.cxx NPSiliconCalibrator.rootmap libNPCalibration.so NPCalibrationLinkDef1.h)
+add_custom_command(OUTPUT NPCalibrationSourceDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPCalibrationSource.h NPCalibrationSourceDict.cxx NPCalibrationSource.rootmap libNPCalibration.so NPCalibrationLinkDef2.h)
add_library(NPCalibration SHARED NPCalibrationSource.cxx NPSiliconCalibrator.cxx NPSiliconCalibratorDict.cxx NPCalibrationSourceDict.cxx)
target_link_libraries(NPCalibration ${ROOT_LIBRARIES} -lSpectrum NPCore NPPhysics)
install(FILES NPCalibrationSource.h NPSiliconCalibrator.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Core/CMakeLists.txt b/NPLib/Core/CMakeLists.txt
index 9bf6b2c319ca55a04be36e9627dd3d7038d946b5..b5fc0cff91488663d5b90d483c1fe1e68ea2d865 100644
--- a/NPLib/Core/CMakeLists.txt
+++ b/NPLib/Core/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_custom_command(OUTPUT TAsciiFileDict.cxx COMMAND ../scripts/build_dict.sh TAsciiFile.h TAsciiFileDict.cxx TAsciiFile.rootmap libNPCore.so)
-add_custom_command(OUTPUT NPDeltaSpectraDict.cxx COMMAND ../scripts/build_dict.sh NPDeltaSpectra.h NPDeltaSpectraDict.cxx NPDeltaSpectra.rootmap libNPCore.so NPDeltaSpectraLinkdef.h)
+add_custom_command(OUTPUT TAsciiFileDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAsciiFile.h TAsciiFileDict.cxx TAsciiFile.rootmap libNPCore.so)
+add_custom_command(OUTPUT NPDeltaSpectraDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPDeltaSpectra.h NPDeltaSpectraDict.cxx NPDeltaSpectra.rootmap libNPCore.so NPDeltaSpectraLinkdef.h)
-add_custom_command(OUTPUT NPVDetectorDict.cxx COMMAND ../scripts/build_dict.sh NPVDetector.h NPVDetectorDict.cxx NPVDetector.rootmap libNPCore.so NPCoreLinkdef.h)
+add_custom_command(OUTPUT NPVDetectorDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPVDetector.h NPVDetectorDict.cxx NPVDetector.rootmap libNPCore.so NPCoreLinkdef.h)
add_library(NPCore SHARED NPCore.cxx NPRandom.cxx NPVAnalysis.cxx NPAnalysisFactory.cxx NPCalibrationManager.cxx NPOptionManager.cxx RootOutput.cxx RootInput.cxx TAsciiFile.cxx TAsciiFileDict.cxx NPDeltaSpectraDict.cxx NPDetectorManager.cxx NPVDetector.cxx NPVDetectorDict.cxx NPVSpectra.cxx NPDetectorFactory.cxx NPSpectraServer.cxx NPInputParser.cxx NPImage.cxx NPElog.cxx NPDeltaSpectra.cxx)
target_link_libraries(NPCore ${ROOT_LIBRARIES})
install(FILES NPCore.h NPVAnalysis.h NPAnalysisFactory.h NPRandom.h NPCalibrationManager.h NPOptionManager.h RootInput.h RootOutput.h TAsciiFile.h NPDetectorManager.h NPVDetector.h NPGlobalSystemOfUnits.h NPPhysicalConstants.h NPSystemOfUnits.h NPVSpectra.h NPDetectorFactory.h NPSpectraServer.h NPInputParser.h NPImage.h NPElog.h NPDeltaSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Online/CMakeLists.txt b/NPLib/Online/CMakeLists.txt
index 85690ed0975714ea642e04b0d8dc04082b9a07c4..ca09ff56b3f596db81ab4166754311b951b98e66 100644
--- a/NPLib/Online/CMakeLists.txt
+++ b/NPLib/Online/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_custom_command(OUTPUT NPOnlineDict.cxx COMMAND ../scripts/build_dict.sh NPOnlineGUI.h NPOnlineDict.cxx NPOnline.rootmap libNPCore.dylib NPOnlineLinkDef.h DEPENDS NPOnlineGUI.h)
+add_custom_command(OUTPUT NPOnlineDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPOnlineGUI.h NPOnlineDict.cxx NPOnline.rootmap libNPCore.dylib NPOnlineLinkDef.h DEPENDS NPOnlineGUI.h)
add_library(NPOnline SHARED NPSpectraClient.cxx NPOnlineGUI.cxx NPOnlineDict.cxx )
target_link_libraries(NPOnline ${ROOT_LIBRARIES} Thread NPCore)
install(FILES NPOnlineGUI.h NPSpectraClient.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Physics/CMakeLists.txt b/NPLib/Physics/CMakeLists.txt
index 47cac7428f05ae453f8748c9547eecccb3acc33f..ed76e00bfe5f56332048acb0e91d6fb441c178dc 100644
--- a/NPLib/Physics/CMakeLists.txt
+++ b/NPLib/Physics/CMakeLists.txt
@@ -1,18 +1,18 @@
-add_custom_command(OUTPUT NPNucleusDict.cxx COMMAND ../scripts/build_dict.sh NPNucleus.h NPNucleusDict.cxx NPNucleus.rootmap libNPPhysics.so NPNucleusLinkDef.h DEPENDS NPNucleus.h NPNucleusLinkDef.h)
+add_custom_command(OUTPUT NPNucleusDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPNucleus.h NPNucleusDict.cxx NPNucleus.rootmap libNPPhysics.so NPNucleusLinkDef.h DEPENDS NPNucleus.h NPNucleusLinkDef.h)
-add_custom_command(OUTPUT NPReactionDict.cxx COMMAND ../scripts/build_dict.sh NPReaction.h NPReactionDict.cxx NPReaction.rootmap libNPPhysics.so NPReactionLinkDef.h DEPENDS NPReaction.h NPReactionLinkDef.h)
+add_custom_command(OUTPUT NPReactionDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPReaction.h NPReactionDict.cxx NPReaction.rootmap libNPPhysics.so NPReactionLinkDef.h DEPENDS NPReaction.h NPReactionLinkDef.h)
-add_custom_command(OUTPUT NPQFSDict.cxx COMMAND ../scripts/build_dict.sh NPQFS.h NPQFSDict.cxx NPQFS.rootmap libNPPhysics.so NPQFSLinkDef.h DEPENDS NPQFS.h NPQFSLinkDef.h)
+add_custom_command(OUTPUT NPQFSDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPQFS.h NPQFSDict.cxx NPQFS.rootmap libNPPhysics.so NPQFSLinkDef.h DEPENDS NPQFS.h NPQFSLinkDef.h)
-add_custom_command(OUTPUT NPDecayDict.cxx COMMAND ../scripts/build_dict.sh NPDecay.h NPDecayDict.cxx NPDecay.rootmap libNPPhysics.so NPDecayLinkDef.h DEPENDS NPDecay.h NPDecayLinkDef.h)
+add_custom_command(OUTPUT NPDecayDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPDecay.h NPDecayDict.cxx NPDecay.rootmap libNPPhysics.so NPDecayLinkDef.h DEPENDS NPDecay.h NPDecayLinkDef.h)
-add_custom_command(OUTPUT NPEnergyLossDict.cxx COMMAND ../scripts/build_dict.sh NPEnergyLoss.h NPEnergyLossDict.cxx NPEnergyLoss.rootmap libNPPhysics.so NPEnergyLossLinkDef.h DEPENDS NPEnergyLoss.h NPEnergyLossLinkDef.h)
+add_custom_command(OUTPUT NPEnergyLossDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPEnergyLoss.h NPEnergyLossDict.cxx NPEnergyLoss.rootmap libNPPhysics.so NPEnergyLossLinkDef.h DEPENDS NPEnergyLoss.h NPEnergyLossLinkDef.h)
-add_custom_command(OUTPUT TInitialConditionsDict.cxx COMMAND ../scripts/build_dict.sh TInitialConditions.h TInitialConditionsDict.cxx TInitialConditions.rootmap libNPInitialConditions.so DEPENDS TInitialConditions.h)
+add_custom_command(OUTPUT TInitialConditionsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TInitialConditions.h TInitialConditionsDict.cxx TInitialConditions.rootmap libNPInitialConditions.so DEPENDS TInitialConditions.h)
-add_custom_command(OUTPUT TInteractionCoordinatesDict.cxx COMMAND ../scripts/build_dict.sh TInteractionCoordinates.h TInteractionCoordinatesDict.cxx TInteractionCoordinates.rootmap libNPInteractionCoordinates.so DEPENDS TInteractionCoordinates.h)
+add_custom_command(OUTPUT TInteractionCoordinatesDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TInteractionCoordinates.h TInteractionCoordinatesDict.cxx TInteractionCoordinates.rootmap libNPInteractionCoordinates.so DEPENDS TInteractionCoordinates.h)
-add_custom_command(OUTPUT TReactionConditionsDict.cxx COMMAND ../scripts/build_dict.sh TReactionConditions.h TReactionConditionsDict.cxx TReactionConditions.rootmap libNPReactionConditions.so DEPENDS TReactionConditions.h)
+add_custom_command(OUTPUT TReactionConditionsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TReactionConditions.h TReactionConditionsDict.cxx TReactionConditions.rootmap libNPReactionConditions.so DEPENDS TReactionConditions.h)
add_library(NPPhysics SHARED NPDecay.cxx NPBeam.cxx NPEnergyLoss.cxx NPFunction.cxx NPNucleus.cxx NPReaction.cxx NPQFS.cxx NPNucleusDict.cxx NPReactionDict.cxx NPQFSDict.cxx NPEnergyLossDict.cxx )
target_link_libraries(NPPhysics ${ROOT_LIBRARIES} Physics NPCore)
diff --git a/NPLib/Physics/NPQFS.cxx b/NPLib/Physics/NPQFS.cxx
index 7577dfe93c6bd9f7280891bcafc1a631c6ba6ffb..6063f494dbf5ecbf07d676d1ad7ad190fc89319a 100644
--- a/NPLib/Physics/NPQFS.cxx
+++ b/NPLib/Physics/NPQFS.cxx
@@ -187,7 +187,9 @@ Nucleus QFS::GetNucleus(string name, NPL::InputParser parser){
}
else{
NPL::SendErrorAndExit("NPL::QFS","Too many nuclei define with the same name");
+ return NPL::Nucleus();
}
+ return NPL::Nucleus();
}
diff --git a/NPLib/TrackReconstruction/CMakeLists.txt b/NPLib/TrackReconstruction/CMakeLists.txt
index 7b71a04dc59dd8877f5930c939e056c631c9e36c..1b61b7ecb9ed0fedb0e7c677ac93a740734e158b 100644
--- a/NPLib/TrackReconstruction/CMakeLists.txt
+++ b/NPLib/TrackReconstruction/CMakeLists.txt
@@ -1,8 +1,8 @@
-add_custom_command(OUTPUT NPRansacDict.cxx COMMAND ../scripts/build_dict.sh NPRansac.h NPRansacDict.cxx NPRansac.rootmap libNPTrackReconstruction.so NPTrackReconstructionLinkDef.h DEPENDS NPRansac.h)
+add_custom_command(OUTPUT NPRansacDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPRansac.h NPRansacDict.cxx NPRansac.rootmap libNPTrackReconstruction.so NPTrackReconstructionLinkDef.h DEPENDS NPRansac.h)
-add_custom_command(OUTPUT NPClusterDict.cxx COMMAND ../scripts/build_dict.sh NPCluster.h NPClusterDict.cxx NPCluster.rootmap libNPTrackReconstruction.so NPTrackReconstructionLinkDef.h DEPENDS NPCluster.h)
+add_custom_command(OUTPUT NPClusterDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh NPCluster.h NPClusterDict.cxx NPCluster.rootmap libNPTrackReconstruction.so NPTrackReconstructionLinkDef.h DEPENDS NPCluster.h)
-add_custom_command(OUTPUT TrackingDict.cxx COMMAND ../scripts/build_dict.sh Tracking.h TrackingDict.cxx Tracking.rootmap libNPTrackReconstruction.so NPTrackReconstructionLinkDef.h DEPENDS Tracking.h)
+add_custom_command(OUTPUT TrackingDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh Tracking.h TrackingDict.cxx Tracking.rootmap libNPTrackReconstruction.so NPTrackReconstructionLinkDef.h DEPENDS Tracking.h)
add_library(NPTrackReconstruction SHARED NPRansac.cxx NPCluster.cxx NPTrack.cxx Tracking.cxx NPRansacDict.cxx NPClusterDict.cxx TrackingDict.cxx)
target_link_libraries(NPTrackReconstruction ${ROOT_LIBRARIES} NPCore)
diff --git a/NPLib/Utility/CMakeLists.txt b/NPLib/Utility/CMakeLists.txt
index 6f3b543c7358748b39433842d45d038e538288de..82bf3b9140ad36728b46bc05f6c653b9a1fa5b4f 100644
--- a/NPLib/Utility/CMakeLists.txt
+++ b/NPLib/Utility/CMakeLists.txt
@@ -8,4 +8,4 @@ add_executable(npspectra_test npspectra_test.cxx)
target_link_libraries(npspectra_test ${ROOT_LIBRARIES} NPCore NPOnline)
install(PROGRAMS nptool-installer npanalysis nponline DESTINATION ${CMAKE_BINARY_OUTPUT_DIRECTORY})
-install(SCRIPT ../scripts/post_install.cmake ${DETLIST})
+install(SCRIPT ${CMAKE_BINARY_DIR}/scripts/post_install.cmake ${DETLIST})
diff --git a/NPSimulation/Core/MaterialManager.cc b/NPSimulation/Core/MaterialManager.cc
index 633fd6d40d0b3081c7ddd89d7f5e97245c8b65f3..bf74f1318361bc0b9e07338433fae7195d658daf 100644
--- a/NPSimulation/Core/MaterialManager.cc
+++ b/NPSimulation/Core/MaterialManager.cc
@@ -582,8 +582,8 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name,
MPT->AddProperty("RINDEX", energy_r, rindex, NumberOfPoints); // check
MPT->AddProperty("ABSLENGTH", energy_r, absorption,
NumberOfPoints); // check
- MPT->AddProperty("FASTCOMPONENT", energy_e, fast, 2.1); // good
- MPT->AddProperty("SLOWCOMPONENT", energy_e, slow, 22.6); // good
+ MPT->AddProperty("FASTCOMPONENT", energy_e, fast, 5); // good
+ MPT->AddProperty("SLOWCOMPONENT", energy_e, slow, 5); // good
MPT->AddConstProperty("RESOLUTIONSCALE", 1.0); // check
MPT->AddConstProperty("FASTTIMECONSTANT", 1000 * ns); // check
MPT->AddConstProperty("SLOWTIMECONSTANT", 1000 * ns); // check
diff --git a/NPSimulation/Detectors/AGATA/AGATA.cc b/NPSimulation/Detectors/AGATA/AGATA.cc
index 2b5d1a717f3b6e9a48c7d64a137538ec8578ad3d..8ce56b5fba26ca0cc9a8ab6828e8d2823133ec65 100644
--- a/NPSimulation/Detectors/AGATA/AGATA.cc
+++ b/NPSimulation/Detectors/AGATA/AGATA.cc
@@ -60,7 +60,7 @@ namespace AGATA_NS{
const double EnergyThreshold = 1*keV;
const double ResoTime = 4.5*ns ;
const double ResoEnergy = 2*keV ;
- const double ResoAngle = 5*deg;
+ //const double ResoAngle = 5*deg;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/NPSimulation/Detectors/Actar/Actar.cc b/NPSimulation/Detectors/Actar/Actar.cc
index 98592a35e713c7354dfbd8a08a643c91256fce35..eb3ef311bd150473a7bf64ac623f54d34f686a89 100644
--- a/NPSimulation/Detectors/Actar/Actar.cc
+++ b/NPSimulation/Detectors/Actar/Actar.cc
@@ -78,7 +78,7 @@ using namespace CLHEP;
namespace Actar_NS{
// Energy and time Resolution
const double ChargeThreshold = 0;
- const double ResoTime = 0.1*ns ;
+ //const double ResoTime = 0.1*ns ;
const double ResoCharge = 5./100 ;
const double ChamberThickness = 376*mm ;
const double ChamberWidth = 376*mm ;
@@ -117,7 +117,7 @@ namespace Actar_NS{
const double CsIWidth = 2.5*cm;
const double DistInterCsI = 1.*mm;
const double CsI_PosZ = 16.*cm;
- const double ResoCsI = 0.200/2.35;
+ //const double ResoCsI = 0.200/2.35;
const double BeamDumpRadius = 30*mm;
const double BeamDumpThickness = 5*mm;
diff --git a/NPSimulation/Detectors/ChiNu/ChiNu.cc b/NPSimulation/Detectors/ChiNu/ChiNu.cc
index 0dca0a96482d8576f6b57929ea2f9c09cc1f8f3a..7d747ef2a82a010a5e40e0a58c9323db06d22523 100644
--- a/NPSimulation/Detectors/ChiNu/ChiNu.cc
+++ b/NPSimulation/Detectors/ChiNu/ChiNu.cc
@@ -92,7 +92,7 @@ namespace ChiNu_NS{
// Fission Chamber
const string FCWall_Material = "CH2";
const double Cu_Thickness = 17*micrometer;
- const double Al_Thickness = 12*micrometer;
+ // const double Al_Thickness = 12*micrometer;
const double Kapton_Thickness = 50*micrometer;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/NPSimulation/Detectors/Dali/Dali.cc b/NPSimulation/Detectors/Dali/Dali.cc
index c8848e87108abf3733198ef73ff4883ed0a417ad..561a665fadeb415d65cee0695606d419e7882f73 100644
--- a/NPSimulation/Detectors/Dali/Dali.cc
+++ b/NPSimulation/Detectors/Dali/Dali.cc
@@ -75,7 +75,7 @@ namespace Dali_NS{
const double ResoTime = 0.0*ns; //4.5*ns ;
const double ResoEnergy = 0.122; //Relative resolution DeltaE = 0.122*Sqrt(E)
/* const double ResoEnergy = 1.36*MeV ; // mean Resolution(FWHM) 1.7% of 80MeV from slides 20170214-SAMURAI34-setup-DALI.pdf if 1.7% of 30MeV = 0.51 MeV // 0.001*MeV ; */
- const double Radius = 50*mm ;
+ //const double Radius = 50*mm ;
const double Width = 49.76*mm ;
const double Hight = 84.81*mm ;
const double Thickness = 164.82*mm ;
@@ -155,9 +155,9 @@ G4LogicalVolume* Dali::BuildSquareDetector(){
G4Material* Aria = MaterialManager::getInstance()->GetMaterialFromLibrary("Air");
G4Material* Al = MaterialManager::getInstance()->GetMaterialFromLibrary("Al");
G4Material* MgO = MaterialManager::getInstance()->GetMaterialFromLibrary("MgO");
- G4Material* muMetal = MaterialManager::getInstance()->GetMaterialFromLibrary("mumetal");
+ //G4Material* muMetal = MaterialManager::getInstance()->GetMaterialFromLibrary("mumetal");
G4Material* Vacuum = MaterialManager::getInstance()->GetMaterialFromLibrary("Vacuum");
- G4Material* BoroSili_Glass = MaterialManager::getInstance()->GetMaterialFromLibrary("Borosillicate_Glass");
+ //G4Material* BoroSili_Glass = MaterialManager::getInstance()->GetMaterialFromLibrary("Borosillicate_Glass");
///// CONTENAIR VOLUMES
G4Box* Dali_3Volume = new G4Box("Dali_3Volume",
@@ -256,7 +256,7 @@ G4LogicalVolume* Dali::BuildSquareDetector(){
G4VisAttributes* MgO_Color = new G4VisAttributes(G4Colour(1,1,1, .4));
G4VisAttributes* Al_Color = new G4VisAttributes(G4Colour(0.5,0.5,0.5, .3));
G4VisAttributes* Crystal_Color = new G4VisAttributes(G4Colour(0, 1, 1));
- G4VisAttributes* mumetal_Color = new G4VisAttributes(G4Colour(0, 0.5, 1, .3));
+ //G4VisAttributes* mumetal_Color = new G4VisAttributes(G4Colour(0, 0.5, 1, .3));
Log_Dali_3Volume->SetVisAttributes(G4VisAttributes(G4Colour(1,1,1, 0)));
diff --git a/NPSimulation/Detectors/Exogam/Exogam.cc b/NPSimulation/Detectors/Exogam/Exogam.cc
index 7b6b5f3e01834fdc710621fdd7509d712cb12c86..698523717185af5b9b422784cf7dd5bd96af0a06 100644
--- a/NPSimulation/Detectors/Exogam/Exogam.cc
+++ b/NPSimulation/Detectors/Exogam/Exogam.cc
@@ -1,18 +1,18 @@
/*****************************************************************************
- * Copyright (C) 2009-2019 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2019 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
*****************************************************************************/
/*****************************************************************************
- * Original Author: Thomas Goigoux contact address: thomas.goigoux@cea.fr *
+ * Original Author: Thomas Goigoux contact address: thomas.goigoux@cea.fr *
* *
- * Creation Date : july 2019 *
+ * Creation Date : july 2019 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
- * This class describe Exogam simulation *
+ * This class describe Exogam simulation *
* *
*---------------------------------------------------------------------------*
* Comment: *
@@ -72,7 +72,7 @@ using namespace CLHEP;
namespace Exogam_NS{
// Energy and time Resolution
const double EnergyThreshold = 10*keV;
- const double ResoTime = 4.5*ns ; //not used
+ //const double ResoTime = 4.5*ns ; //not used
const double ResoEnergy = 2.*keV ;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -628,7 +628,7 @@ void Exogam::InitializeRootOutput(){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
// Read sensitive part and fill the Root tree.
// Called at in the EventAction::EndOfEventAvtion
-void Exogam::ReadSensitive(const G4Event* event){
+void Exogam::ReadSensitive(const G4Event*){
m_Event->Clear();
///////////
diff --git a/NPSimulation/Detectors/LightPipe/LightPipe.hh b/NPSimulation/Detectors/LightPipe/LightPipe.hh
index 9980c8d220a36915901e9bfd29a84dd4259f0ae5..ea431390f5f20a919b74ea810859071f02a0c78d 100644
--- a/NPSimulation/Detectors/LightPipe/LightPipe.hh
+++ b/NPSimulation/Detectors/LightPipe/LightPipe.hh
@@ -1,20 +1,20 @@
#ifndef LightPipe_h
#define LightPipe_h 1
/*****************************************************************************
- * Copyright (C) 2009-2018 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2018 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
*****************************************************************************/
/*****************************************************************************
- * Original Author: Greg Christian contact address: gchristian@tamu.edu *
+ * Original Author: Greg Christian contact address: gchristian@tamu.edu *
* *
- * Creation Date : July 2018 *
+ * Creation Date : July 2018 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
- * This class describe LightPipe simulation *
+ * This class describe LightPipe simulation *
* *
*---------------------------------------------------------------------------*
* Comment: *
@@ -78,7 +78,7 @@ public:
private:
G4Material* m_ScintillatorMaterial;
G4Material* m_PipeMaterial;
- G4Material* m_WrappingMaterial;
+ //G4Material* m_WrappingMaterial;
G4OpticalSurface* m_ReflectiveSurface;
G4Material* CreateScintillatorMaterial() const;
diff --git a/NPSimulation/Detectors/Miniball/Miniball.cc b/NPSimulation/Detectors/Miniball/Miniball.cc
index 0da1686617c935f21e1078cbc970f3337309f91d..04821fddda63dcb6daa37af7c9dbd2cdb53041f5 100644
--- a/NPSimulation/Detectors/Miniball/Miniball.cc
+++ b/NPSimulation/Detectors/Miniball/Miniball.cc
@@ -58,7 +58,7 @@ namespace Miniball_NS{
const double EnergyThreshold = 0.01*MeV;
const double ResoTime = 4.5*ns ;
const double ResoEnergy = 0.003*MeV ;
- const double ResoAngle = 5*deg;
+ //const double ResoAngle = 5*deg;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/NPSimulation/Detectors/Minos/Minos.cc b/NPSimulation/Detectors/Minos/Minos.cc
index a9cc583fb81c778c83dfa7fce8e979390f03bb2c..38a58decd0fe6476fa5193fcdeb8bb7d6d6a6c6d 100644
--- a/NPSimulation/Detectors/Minos/Minos.cc
+++ b/NPSimulation/Detectors/Minos/Minos.cc
@@ -83,7 +83,7 @@ namespace Minos_NS{
// TPC
const G4double ChamberInnerRadius = 37.*mm;
/* const G4double ChamberInnerRadius = 29*mm; */ //big TPC
-const G4double ChamberThickness = 2.*mm;
+//const G4double ChamberThickness = 2.*mm;
const G4double ChamberLength = 300.*mm;
const G4double KaptonThickness = 0.125*mm;
const G4double RohacellThickness = 2.*mm;
diff --git a/NPSimulation/Detectors/Mugast/Mugast.cc b/NPSimulation/Detectors/Mugast/Mugast.cc
index 4437c7404cfe669703c45fc74603c29174473233..ac90486a5a5c7528eae92fa59c26b0db4a4f5945 100644
--- a/NPSimulation/Detectors/Mugast/Mugast.cc
+++ b/NPSimulation/Detectors/Mugast/Mugast.cc
@@ -65,13 +65,13 @@ namespace Mugast_NS{
// Resolution
const G4double SigmaTime = 0.212765957 ;// = 500ps
const G4double SigmaEnergy = 0.0149 ;// 0.0223 = 52keV of Resolution // Unit is MeV/2.35 14.861996
- const G4double TimeOffset = 500 ;// 500 ns stop
+// const G4double TimeOffset = 500 ;// 500 ns stop
// Threshold
const G4double EnergyThreshold = 1 * MeV;
// Geometry
- const G4double AluStripThickness = 0.4*micrometer ;
+ //const G4double AluStripThickness = 0.4*micrometer ;
const G4double SiliconThickness = 3000*micrometer ;
// Square
@@ -102,7 +102,7 @@ namespace Mugast_NS{
const G4double PCBPointsX[8]={-40,40,60,60,40,-40,-60,-60};
const G4double PCBPointsY[8]={60,60,40,-40,-60,-60,-40,40};
const G4double PCBThickness=3.2*mm;
- const G4double PCBInnerRadius=0*mm;
+ //const G4double PCBInnerRadius=0*mm;
@@ -644,8 +644,8 @@ void Mugast::ReadSensitive(const G4Event* ){
if(Energy>EnergyThreshold){
double Time = RandGauss::shoot(AnnularScorer->GetTimeRing(i), SigmaTime);
- int DetNbr = AnnularScorer->GetDetectorRing(i);
- int StripFront = AnnularScorer->GetStripRing(i);
+ unsigned int DetNbr = AnnularScorer->GetDetectorRing(i);
+ unsigned int StripFront = AnnularScorer->GetStripRing(i);
// Check for associated Quadrant strip
int StripQuadrant = 0;
diff --git a/NPSimulation/Detectors/TNT/TNT.cc b/NPSimulation/Detectors/TNT/TNT.cc
index 6c99830f65ac817bc87a3ebd2ef4dd6e63881d35..d428cf2775af92b05bfd042db877f98b75deb039 100644
--- a/NPSimulation/Detectors/TNT/TNT.cc
+++ b/NPSimulation/Detectors/TNT/TNT.cc
@@ -61,8 +61,8 @@ using namespace CLHEP;
namespace TNT_NS{
// Energy and time Resolution
const double EnergyThreshold = 0.1*MeV;
- const double ResoTime = 4.5*ns ;
- const double ResoEnergy = 1.0*MeV ;
+ //const double ResoTime = 4.5*ns ;
+// const double ResoEnergy = 1.0*MeV ;
const double Radius = 50*mm ;
// const string Material = "para-Terphenyl_Scintillator";
//const string Material = "BC400";
diff --git a/NPSimulation/Detectors/beam_dump/beam_dump.cc b/NPSimulation/Detectors/beam_dump/beam_dump.cc
index aa1460dda104d8663db6b37f1d09a98f8ce31b9d..674882e5a3b0b0e5795e7e8fdc3b9dae18f10381 100755
--- a/NPSimulation/Detectors/beam_dump/beam_dump.cc
+++ b/NPSimulation/Detectors/beam_dump/beam_dump.cc
@@ -1,18 +1,18 @@
/*****************************************************************************
- * Copyright (C) 2009-2017 this file is part of the NPTool Project *
+ * Copyright (C) 2009-2017 this file is part of the NPTool Project *
* *
* For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
* For the list of contributors see $NPTOOL/Licence/Contributors *
*****************************************************************************/
/*****************************************************************************
- * Original Author: valerian contact address: girardalcindor@ganil.fr *
+ * Original Author: valerian contact address: girardalcindor@ganil.fr *
* *
- * Creation Date : November 2017 *
+ * Creation Date : November 2017 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
- * This class describe beam_dump simulation *
+ * This class describe beam_dump simulation *
* *
*---------------------------------------------------------------------------*
* Comment: *
@@ -59,8 +59,8 @@ namespace beam_dump_NS{
const double EnergyThreshold = 0.0*MeV;
const double ResoTime = 0.0*ns ;
const double ResoEnergy = 0.0*MeV ;
- const double Radius = 20*cm ;
- const double Width = 10*cm ;
+ //const double Radius = 20*cm ;
+ //const double Width = 10*cm ;
// const double Thickness = 34*um ;
}
diff --git a/NPSimulation/Scorers/CalorimeterScorers.hh b/NPSimulation/Scorers/CalorimeterScorers.hh
index 8525e52951cdeaa53f53c005d4fccb8f9f151c33..f4565637a54556630f4397ca0cd2bf0963779f52 100644
--- a/NPSimulation/Scorers/CalorimeterScorers.hh
+++ b/NPSimulation/Scorers/CalorimeterScorers.hh
@@ -106,7 +106,6 @@ namespace CalorimeterScorers {
// Give the list of the nesting level at which the copy number should be return.
// 0 is the lowest level possible (the actual volume copy number in which the interaction happen)
vector<G4int> m_NestingLevel;
- G4int m_Index;
private:
CalorimeterDataVector m_Data;
diff --git a/NPSimulation/Scorers/CylinderTPCScorers.hh b/NPSimulation/Scorers/CylinderTPCScorers.hh
index 14463f091c2644e94d6e7b00ab5224841a10862c..1f9434d196fdc7ab05f265c9f38eb07ddb0f24ae 100644
--- a/NPSimulation/Scorers/CylinderTPCScorers.hh
+++ b/NPSimulation/Scorers/CylinderTPCScorers.hh
@@ -125,7 +125,6 @@ namespace CylinderTPCScorers{
private: // Needed for intermediate calculation (avoid multiple instantiation in Processing Hit)
vector<G4int> m_NestingLevel;
- unsigned int m_Level;
double t_Charge;
double t_DriftTime;
unsigned int t_Pad;
diff --git a/NPSimulation/Scorers/DSSDScorers.hh b/NPSimulation/Scorers/DSSDScorers.hh
index 3447ed112e7dec4e9ec6f03b6689ba64d9ec2330..326c334b3769d0fe9f98328127d86365f530d9dd 100644
--- a/NPSimulation/Scorers/DSSDScorers.hh
+++ b/NPSimulation/Scorers/DSSDScorers.hh
@@ -131,7 +131,6 @@ namespace DSSDScorers {
private: // Needed for intermediate calculation (avoid multiple instantiation in Processing Hit)
G4ThreeVector t_Position;
- unsigned int t_Index;
double t_Energy;
double t_Time;
unsigned int t_DetectorNbr;
@@ -190,7 +189,6 @@ namespace DSSDScorers {
DSSDDataVector m_HitWidth;
private: // Needed for intermediate calculation (avoid multiple instantiation in Processing Hit)
G4ThreeVector t_Position;
- unsigned int t_Index;
double t_Energy;
double t_Time;
unsigned int t_DetectorNumber;
@@ -257,7 +255,6 @@ namespace DSSDScorers {
private: // Needed for intermediate calculation (avoid multiple instantiation in Processing Hit)
G4ThreeVector t_Position;
- unsigned int t_Index;
double t_Energy;
double t_Time;
unsigned int t_DetectorNumber;
@@ -333,7 +330,6 @@ namespace DSSDScorers {
double t_Time;
unsigned int t_DetectorNumber;
unsigned int t_StripWidthNumber;
- unsigned int t_Index;
public:
inline unsigned int GetUpMult() {return m_HitUp.size();};
inline unsigned int GetStripUp(const unsigned int& i){return m_HitUp[i]->GetStrip();};
diff --git a/NPSimulation/Scorers/DriftChamberScorers.hh b/NPSimulation/Scorers/DriftChamberScorers.hh
index 2c0c7c6755cef1b49481743310855f1e4ccb8e13..aa966d0bcc2b0857bd04c0822eda29ecff9cb813 100644
--- a/NPSimulation/Scorers/DriftChamberScorers.hh
+++ b/NPSimulation/Scorers/DriftChamberScorers.hh
@@ -120,14 +120,12 @@ namespace DriftChamberScorers {
private:
vector<G4int> m_NestingLevel;
- G4int m_Index;
private: // Needed for intermediate calculation (avoid multiple instantiation
// in Processing Hit)
DCDataVector m_Data;
vector<unsigned int> t_Level;
- unsigned int t_Detector;
G4ThreeVector m_Dir;
double m_DriftSpeed;
double t_preout;