Fixed the confliction.

Inputs/DetectorConfiguration/e628.detector

Inputs/EnergyLoss/F19_Al.SRIM

Inputs/EnergyLoss/F19_CD2.SRIM

Inputs/EnergyLoss/F19_Si.SRIM

Inputs/EnergyLoss/Mg25_Al.SRIM

Inputs/EnergyLoss/Mg25_CD2.SRIM

Inputs/EnergyLoss/proton_CD2.SRIM

NPLib/Calibration/NPSiliconCalibrator.cxx

NPLib/Calibration/NPSiliconCalibrator.h

NPLib/CanvasList.txt

NPLib/Core/CMakeLists.txt

NPLib/Core/NPCalibrationManager.cxx

NPLib/Core/NPCalibrationManager.h

NPLib/Core/NPCore.cxx

NPLib/Core/NPCore.h

NPLib/Core/NPDetectorFactory.cxx

NPLib/Core/NPDetectorFactory.h

NPLib/Core/NPDetectorManager.cxx

NPLib/Core/NPImage.h

NPLib/Core/NPInputParser.cxx