diff --git a/NPLib/AnnularS1/TS1Data.h b/NPLib/AnnularS1/TS1Data.h index 2f9720175fdc75a317ec61e3e794eb878708d5f2..1c9bd1278402917c890259752472c882844fabfb 100644 --- a/NPLib/AnnularS1/TS1Data.h +++ b/NPLib/AnnularS1/TS1Data.h @@ -61,25 +61,25 @@ class TS1Data : public TObject { ///////////////////// GETTERS //////////////////////// // (Th,E) - const unsigned int GetS1ThetaEMult() const {return fS1_Theta_E_DetNbr.size();} - const int GetS1ThetaEDetectorNbr(const int& i) const {return fS1_Theta_E_DetNbr.at(i);} - const int GetS1ThetaEStripNbr(const int& i) const {return fS1_Theta_E_StripNbr.at(i);} - const double GetS1ThetaEEnergy(const int& i) const {return fS1_Theta_E_Energy.at(i);} + unsigned int GetS1ThetaEMult() const {return fS1_Theta_E_DetNbr.size();} + int GetS1ThetaEDetectorNbr(const int& i) const {return fS1_Theta_E_DetNbr.at(i);} + int GetS1ThetaEStripNbr(const int& i) const {return fS1_Theta_E_StripNbr.at(i);} + double GetS1ThetaEEnergy(const int& i) const {return fS1_Theta_E_Energy.at(i);} // (Th,T) - const unsigned int GetS1ThetaTMult() const {return fS1_Theta_T_DetNbr.size();} - const int GetS1ThetaTDetectorNbr(const int& i) const {return fS1_Theta_T_DetNbr.at(i);} - const int GetS1ThetaTStripNbr(const int& i) const {return fS1_Theta_T_StripNbr.at(i);} - const double GetS1ThetaTTime(const int& i) const {return fS1_Theta_T_Time.at(i);} + unsigned int GetS1ThetaTMult() const {return fS1_Theta_T_DetNbr.size();} + int GetS1ThetaTDetectorNbr(const int& i) const {return fS1_Theta_T_DetNbr.at(i);} + int GetS1ThetaTStripNbr(const int& i) const {return fS1_Theta_T_StripNbr.at(i);} + double GetS1ThetaTTime(const int& i) const {return fS1_Theta_T_Time.at(i);} // (Ph,E) - const unsigned int GetS1PhiEMult() const {return fS1_Phi_E_DetNbr.size();} - const int GetS1PhiEDetectorNbr(const int& i) const {return fS1_Phi_E_DetNbr.at(i);} - const int GetS1PhiEStripNbr(const int& i) const {return fS1_Phi_E_StripNbr.at(i);} - const double GetS1PhiEEnergy(const int& i) const {return fS1_Phi_E_Energy.at(i);} + unsigned int GetS1PhiEMult() const {return fS1_Phi_E_DetNbr.size();} + int GetS1PhiEDetectorNbr(const int& i) const {return fS1_Phi_E_DetNbr.at(i);} + int GetS1PhiEStripNbr(const int& i) const {return fS1_Phi_E_StripNbr.at(i);} + double GetS1PhiEEnergy(const int& i) const {return fS1_Phi_E_Energy.at(i);} // (Ph,T) - const unsigned int GetS1PhiTMult() const {return fS1_Phi_T_DetNbr.size();} - const int GetS1PhiTDetectorNbr(const int& i) const {return fS1_Phi_T_DetNbr.at(i);} - const int GetS1PhiTStripNbr(const int& i) const {return fS1_Phi_T_StripNbr.at(i);} - const double GetS1PhiTTime(const int& i) const {return fS1_Phi_T_Time.at(i);} + unsigned int GetS1PhiTMult() const {return fS1_Phi_T_DetNbr.size();} + int GetS1PhiTDetectorNbr(const int& i) const {return fS1_Phi_T_DetNbr.at(i);} + int GetS1PhiTStripNbr(const int& i) const {return fS1_Phi_T_StripNbr.at(i);} + double GetS1PhiTTime(const int& i) const {return fS1_Phi_T_Time.at(i);} ///////////////////// SETTERS //////////////////////// // (Th,E) diff --git a/NPSimulation/src/Chamber.cc b/NPSimulation/src/Chamber.cc index ee0e95a625f01ea094371c2ce1b237443c349afc..abca1ab9863572aa040ad647905039779c7db1f3 100644 --- a/NPSimulation/src/Chamber.cc +++ b/NPSimulation/src/Chamber.cc @@ -61,6 +61,10 @@ Chamber::Chamber() G4Material* Chamber::GetMaterialFromLibrary(G4String MaterialName, G4double Temperature, G4double Pressure) { + // avoid compilation warnings + Temperature *= 1; + Pressure *= 1; + if (MaterialName == "Alu") { return MaterialManager::getInstance()->GetMaterialFromLibrary("Al"); } diff --git a/NPSimulation/src/DetectorMessenger.cc b/NPSimulation/src/DetectorMessenger.cc index ba3ec70b3c088bb8d65f8cf7215a7c675c97e2c0..063964b869fb99a3e938ee0edf471acd00bf8d00 100644 --- a/NPSimulation/src/DetectorMessenger.cc +++ b/NPSimulation/src/DetectorMessenger.cc @@ -53,7 +53,7 @@ DetectorMessenger::~DetectorMessenger(){ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue){ +void DetectorMessenger::SetNewValue(G4UIcommand* command, G4String){ if( command == UpdateCmd ) { Detector->RedefineGeometry(""); } } diff --git a/NPSimulation/src/EventGeneratorTwoBodyReaction.cc b/NPSimulation/src/EventGeneratorTwoBodyReaction.cc index 21779c32922fa5e6f4e5a140985c70fb4d43d68c..6244888441f48b76c810b5b6cb3f333b768dfe7b 100644 --- a/NPSimulation/src/EventGeneratorTwoBodyReaction.cc +++ b/NPSimulation/src/EventGeneratorTwoBodyReaction.cc @@ -98,7 +98,7 @@ void EventGeneratorTwoBodyReaction::ReadConfiguration(string Path, int){ } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void EventGeneratorTwoBodyReaction::GenerateEvent(G4Event* anEvent){ +void EventGeneratorTwoBodyReaction::GenerateEvent(G4Event*){ ////////////////////////////////////////////////// //////Define the kind of particle to shoot//////// //////////////////////////////////////////////////