Commit 0b00607e authored by Adrien Matta's avatar Adrien Matta
Browse files

* Fixing warning on Mac Os

parent 87fc4060
Pipeline #67634 passed with stages
in 12 minutes and 9 seconds
......@@ -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)
......
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})
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})
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})
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)
......
......@@ -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();
}
......
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)
......
......@@ -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})
......@@ -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
......
......@@ -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......
......
......@@ -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;
......
......@@ -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......
......
......@@ -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)));
......
/*****************************************************************************
* 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();
///////////
......
#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;
......
......@@ -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......
......
......@@ -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;
......
......@@ -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;
......
......@@ -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";
......
/*****************************************************************************
* 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 ;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment