diff --git a/NPSimulation/include/EventGeneratorIsotropic.hh b/NPSimulation/include/EventGeneratorIsotropic.hh
index 3564bf6e3984baf8f706d548ca6eb41968263490..c2d7c8dd21bc9edb0b160db91fa1fb5b6da4af94 100644
--- a/NPSimulation/include/EventGeneratorIsotropic.hh
+++ b/NPSimulation/include/EventGeneratorIsotropic.hh
@@ -38,7 +38,7 @@ public: // Constructor and destructor
virtual ~EventGeneratorIsotropic();
public: // Inherit from VEventGenerator Class
- void ReadConfiguration(string,int dump=0) ;
+ void ReadConfiguration(string,int) ;
void GenerateEvent(G4Event*) ;
void InitializeRootOutput() ;
diff --git a/NPSimulation/include/EventGeneratorTwoBodyReaction.hh b/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
index 85389059bba75a0349b38491eca3f9d4d9ca840a..467bd71166c673f78f74bc362737bb830d81f766 100644
--- a/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
+++ b/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
@@ -54,7 +54,7 @@ class EventGeneratorTwoBodyReaction : public VEventGenerator
public: // Inherit from VEventGenerator class
- void ReadConfiguration(string,int dump=0);
+ void ReadConfiguration(string,int);
void GenerateEvent(G4Event*);
void SetTarget(Target* Target) ;
diff --git a/NPSimulation/include/VEventGenerator.hh b/NPSimulation/include/VEventGenerator.hh
index 5ec0e75407dadfb44ae4315ea8aa77029b5fcf9f..9da49d9a756c617f5e4f7f98dc7ada9458501545 100644
--- a/NPSimulation/include/VEventGenerator.hh
+++ b/NPSimulation/include/VEventGenerator.hh
@@ -53,7 +53,7 @@ public:
virtual ~VEventGenerator();
public:
- virtual void ReadConfiguration(string,int iteration=0) {};
+ virtual void ReadConfiguration(string,int dump=0) {dump=0;};
virtual void GenerateEvent(G4Event*) {};
virtual void InitializeRootOutput() {};
diff --git a/NPSimulation/src/EventGeneratorBeam.cc b/NPSimulation/src/EventGeneratorBeam.cc
index 3867bbe163203f90604045e27600455ff5d3334b..c7399854ec9d83c1bf449a17efac3687f137af1d 100644
--- a/NPSimulation/src/EventGeneratorBeam.cc
+++ b/NPSimulation/src/EventGeneratorBeam.cc
@@ -69,8 +69,7 @@ void EventGeneratorBeam::SetTarget(Target* Target){
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void EventGeneratorBeam::ReadConfiguration(string Path,int dump){
- dump=0;
+void EventGeneratorBeam::ReadConfiguration(string Path,int){
m_Beam->ReadConfigurationFile(Path);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/NPSimulation/src/EventGeneratorIsotropic.cc b/NPSimulation/src/EventGeneratorIsotropic.cc
index 8584384c6fc11a09038c1752950805a26eba7358..5b2d29cc31b83b2da535948f4c54d396822eb512 100644
--- a/NPSimulation/src/EventGeneratorIsotropic.cc
+++ b/NPSimulation/src/EventGeneratorIsotropic.cc
@@ -60,8 +60,7 @@ EventGeneratorIsotropic::~EventGeneratorIsotropic(){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void EventGeneratorIsotropic::ReadConfiguration(string Path,int dump){
- dump= 0;
+void EventGeneratorIsotropic::ReadConfiguration(string Path,int){
////////General Reading needs////////
string LineBuffer;
string DataBuffer;
@@ -191,7 +190,7 @@ void EventGeneratorIsotropic::ReadConfiguration(string Path,int dump){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void EventGeneratorIsotropic::GenerateEvent(G4Event* anEvent){
+void EventGeneratorIsotropic::GenerateEvent(G4Event*){
if(m_particle==NULL){
if(m_particleName!="gamma"){
diff --git a/NPSimulation/src/EventGeneratorParticleDecay.cc b/NPSimulation/src/EventGeneratorParticleDecay.cc
index cb1e20f1af97a1f9c62942f35b161b46281934a0..703a32044432abcc46f4d5cbf062c4301abb4b2b 100644
--- a/NPSimulation/src/EventGeneratorParticleDecay.cc
+++ b/NPSimulation/src/EventGeneratorParticleDecay.cc
@@ -64,8 +64,6 @@ void EventGeneratorParticleDecay::ReadConfiguration(string Path,int Occurence){
bool ReadingStatusParticleDecay = false ;
bool check_Daughter = false ;
- bool check_CrossSection = false ;
- bool check_ExcitationEnergy = false ;
bool check_shoot = false ;
bool check_created = false ;
@@ -136,7 +134,6 @@ void EventGeneratorParticleDecay::ReadConfiguration(string Path,int Occurence){
}
else if(DataBuffer == "ExcitationEnergy=") {
- check_ExcitationEnergy = true;
LineStream.clear();
LineStream.str(LineBuffer);
@@ -159,7 +156,6 @@ void EventGeneratorParticleDecay::ReadConfiguration(string Path,int Occurence){
LineStream.str(LineBuffer);
LineStream >> CSPath >> CSName ;
if(VerboseLevel==1) G4cout << " Cross Section Path: " << CSPath << G4endl;
- check_CrossSection = true;
}
else if(DataBuffer == "shoot=") {
@@ -201,7 +197,7 @@ void EventGeneratorParticleDecay::ReadConfiguration(string Path,int Occurence){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void EventGeneratorParticleDecay::GenerateEvent(G4Event* anEvent){
+void EventGeneratorParticleDecay::GenerateEvent(G4Event*){
// Look for the decaying nucleus
Particle decayingParticle = m_ParticleStack->SearchAndRemoveParticle(m_MotherNucleiName);
diff --git a/NPSimulation/src/EventGeneratorTwoBodyReaction.cc b/NPSimulation/src/EventGeneratorTwoBodyReaction.cc
index 3e048c743a2eba299be6afa15353cc4603f4201c..0663f41f0a68e226cf6cda6f2f51c1a8d19f96de 100644
--- a/NPSimulation/src/EventGeneratorTwoBodyReaction.cc
+++ b/NPSimulation/src/EventGeneratorTwoBodyReaction.cc
@@ -90,10 +90,8 @@ void EventGeneratorTwoBodyReaction::Print() const{
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
// Inherit from VEventGenerator
-void EventGeneratorTwoBodyReaction::ReadConfiguration(string Path, int dump){
- dump = 0 ;
+void EventGeneratorTwoBodyReaction::ReadConfiguration(string Path, int){
m_Reaction->ReadConfigurationFile(Path);
-
m_ShootLight = m_Reaction->GetShoot3();
m_ShootHeavy = m_Reaction->GetShoot4();;
diff --git a/NPSimulation/src/Sharc.cc b/NPSimulation/src/Sharc.cc
index 9cb81c97837fdd55c01eda076cceaf986f87cd17..b0c98770bcc79a2de10708bbf51a3af0f97556b1 100644
--- a/NPSimulation/src/Sharc.cc
+++ b/NPSimulation/src/Sharc.cc
@@ -119,6 +119,8 @@ void Sharc::ReadConfiguration(string Path){
string DataBuffer ;
G4double R,Phi,Thickness1,Thickness2,Thickness3,Thickness4,ThicknessPAD1,ThicknessPAD2,ThicknessPAD3,ThicknessPAD4,Z;
+ R=Phi=Thickness1=Thickness2=Thickness3=Thickness4=ThicknessPAD1=ThicknessPAD2=ThicknessPAD3=ThicknessPAD4=Z=0;
+
G4ThreeVector Pos;
bool check_R = false ;
bool check_Phi = false ;
@@ -357,14 +359,12 @@ void Sharc::ConstructBOXDetector(G4LogicalVolume* world){
G4double BOX_PCB_Slot_Width;
G4double BOX_PCB_Slot_Deepness;
- G4double BOX_PCB_Slot_Border;
G4double BOX_PCB_Slot_Position;
G4double BOX_DetectorSpacing;
if(m_ThicknessPAD[i][j]>0){ //PAD Case
BOX_PCB_Slot_Width = BOX_PCB_Slot_Width2;
BOX_PCB_Slot_Deepness = BOX_PCB_Slot_Deepness2;
- BOX_PCB_Slot_Border = BOX_PCB_Slot_Border2;
BOX_PCB_Slot_Position = BOX_PCB_Slot_Position2;
BOX_DetectorSpacing = BOX_DetectorSpacing2;
}
@@ -372,7 +372,6 @@ void Sharc::ConstructBOXDetector(G4LogicalVolume* world){
else{ // No Pad Case
BOX_PCB_Slot_Width = BOX_PCB_Slot_Width1;
BOX_PCB_Slot_Deepness = BOX_PCB_Slot_Deepness1;
- BOX_PCB_Slot_Border = BOX_PCB_Slot_Border1;
BOX_PCB_Slot_Position = BOX_PCB_Slot_Position1;
BOX_DetectorSpacing = BOX_DetectorSpacing1 ;
}
@@ -418,7 +417,8 @@ void Sharc::ConstructBOXDetector(G4LogicalVolume* world){
// create the PAD
// Make a single detector geometry
- G4LogicalVolume* logicPADDetector;
+ G4LogicalVolume* logicPADDetector = NULL;
+
G4ThreeVector PAD_Wafer_Offset =
G4ThreeVector(PAD_Wafer_Length_Offset, PAD_Wafer_Width_Offset,0 );
if(m_ThicknessPAD[i][j]>0){
@@ -470,7 +470,6 @@ void Sharc::ConstructBOXDetector(G4LogicalVolume* world){
PAD_Wafer_Offset-G4ThreeVector(0,0,0.5*PAD_PCB_Thickness-0.5*m_ThicknessPAD[i][j]),
logicPADWafer,"PAD_Wafer",logicPADDetector,false,DetNbr);
}
-
///////////////////////////////////////////////////////////////////////////////////
// Place the detector in the world
// Position of the center of the PCB