From da0900c9993c72c6ffd0436af3b0f7d81a9f1f8f Mon Sep 17 00:00:00 2001
From: Nicolas de Sereville <deserevi@ipno.in2p3.fr>
Date: Thu, 27 Nov 2014 22:49:36 +0100
Subject: [PATCH] + Fix compilation warnings in NPS
---
NPLib/AnnularS1/TS1Data.h | 32 +++++++++----------
NPSimulation/src/Chamber.cc | 4 +++
NPSimulation/src/DetectorMessenger.cc | 2 +-
.../src/EventGeneratorTwoBodyReaction.cc | 2 +-
4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/NPLib/AnnularS1/TS1Data.h b/NPLib/AnnularS1/TS1Data.h
index 2f9720175..1c9bd1278 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 ee0e95a62..abca1ab98 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 ba3ec70b3..063964b86 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 21779c329..624488844 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////////
//////////////////////////////////////////////////
--
GitLab