diff --git a/NPSimulation/Core/CalorimeterScorers.cc b/NPSimulation/Core/CalorimeterScorers.cc
index 77848b87e2abb781b8c0242a43de23543680e9ab..a5f991a48059a5868ff09eb22a58c18df71cc1c3 100644
--- a/NPSimulation/Core/CalorimeterScorers.cc
+++ b/NPSimulation/Core/CalorimeterScorers.cc
@@ -118,7 +118,7 @@ G4bool PS_CalorimeterWithInteraction::ProcessHits(G4Step* aStep, G4TouchableHist
Infos[1] = aStep->GetPreStepPoint()->GetGlobalTime();
// Interaction coordinates (used to fill the InteractionCoordinates branch)
- G4ThreeVector m_Position = aStep->GetPreStepPoint()->GetPosition();
+ m_Position = aStep->GetPreStepPoint()->GetPosition();
Infos[2] = m_Position.x();
Infos[3] = m_Position.y();
diff --git a/NPSimulation/Core/Chamber.cc b/NPSimulation/Core/Chamber.cc
index 70147718ba1946261b7fd3153d54fc219814c724..3c9c94403ea248a067bca93e5f9bbde7bdea4584 100644
--- a/NPSimulation/Core/Chamber.cc
+++ b/NPSimulation/Core/Chamber.cc
@@ -288,16 +288,14 @@ void Chamber::DefineMaterials()
G4Material* Ge=new G4Material(name="Germanium", z=32., a, density);
a=26.98*g/mole; density=2.7*g/cm3;
- G4Material* Al;
- Al=new G4Material(name="Aluminium", z=13., a, density);
+
+ new G4Material(name="Aluminium", z=13., a, density);
a=63.54*g/mole; density=8.96*g/cm3;
- G4Material* Cu;
- Cu=new G4Material(name="Copper", z=29., a, density);
+ new G4Material(name="Copper", z=29., a, density);
a=183.84*g/mole; density=19.3*g/cm3;
- G4Material* W;
- W=new G4Material(name="Tungsten", z=74., a, density);
+ new G4Material(name="Tungsten", z=74., a, density);
//---------------------------------
// AIR
@@ -1478,8 +1476,7 @@ void Chamber::ConstructDetector(G4LogicalVolume* world)
G4double PinGap = 1.0 * mm; //between PINS
G4double PinToEdge = 3.0 * mm; //gap from the end
G4double PinEpoxyT = 1.6 * mm; //thickness of pcb board
- G4double PinSupportLip;
- PinSupportLip = PinT+PinEpoxyT; //thickness of pcb board
+ //G4double PinSupportLip = PinT+PinEpoxyT; //thickness of pcb board
//horizontal-side dimensions [approxiamted as a single board]
G4double PinBoard_H_W = PinL*5.;
@@ -1699,22 +1696,17 @@ void Chamber::ConstructDetector(G4LogicalVolume* world)
//visAttPIN->SetVisibility(false);
visAttPIN->SetForceWireframe(true);
- G4double Pin_z1, Pin_z2;
- Pin_z1 = PinBoard_z + PinBoard_V_L/2. - PinToEdge - PinL/2;
- Pin_z2 = Pin_z1 - PinGap - PinL;
+ G4double Pin_z1 = PinBoard_z + PinBoard_V_L/2. - PinToEdge - PinL/2;
+ //G4double Pin_z2 = Pin_z1 - PinGap - PinL;
//total Si area
- G4Box* solidPINS_H;
- solidPINS_H = new G4Box("pins-passive", PinL/2., PinT/2., PinL/2); //horizontal
- G4Box* solidPINS_V;
- solidPINS_V = new G4Box("pins-passive", PinT/2., PinL/2., PinL/2); //vertical
+ G4Box* solidPINS_H = new G4Box("pins-passive", PinL/2., PinT/2., PinL/2); //horizontal
+ new G4Box("pins-passive", PinT/2., PinL/2., PinL/2); //vertical
//active Si
G4Box* solidPINS_Active_H;
solidPINS_Active_H = new G4Box("pins", PinL/2.-PinGuard, PinT/2., PinL/2-PinGuard); //horizontal
- G4Box* solidPINS_Active_V;
- solidPINS_Active_V = new G4Box("pins", PinT/2., PinL/2.-PinGuard, PinL/2-PinGuard); //vertical
-
+ new G4Box("pins", PinT/2., PinL/2.-PinGuard, PinL/2-PinGuard); //vertical
//horizontal rows could put an index[i] = copyNo to match position in real array !!
for(G4int nH = 0; nH < 2; nH++) { //up/down
@@ -2139,7 +2131,7 @@ void Chamber::Place_PhaseIIs_Left_and_Right(G4LogicalVolume* world)
G4RotationMatrix* rmC;
G4double leafX;
G4double leafY;
- G4double leafZ;
+ //G4double leafZ;
//Keep track of which detectors are used
//G4String detName[2] = {"CloverR","CloverL"}; //Looking upstream
@@ -2163,7 +2155,7 @@ void Chamber::Place_PhaseIIs_Left_and_Right(G4LogicalVolume* world)
leafY = -22.15*mm;
}
//the z-translation
- leafZ = geLeaf_PosZ;
+ //leafZ = geLeaf_PosZ;
//for(G4int det = prevNumber; det < numberOfClovers; det++) {
@@ -2317,7 +2309,7 @@ void Chamber::Place_PhaseII_On_the_Top(G4LogicalVolume* world)
G4RotationMatrix* rmC;
G4double leafX;
G4double leafY;
- G4double leafZ;
+ //G4double leafZ;
for(G4int l = 0; l < 4; l++) {
//the rotation
@@ -2338,7 +2330,7 @@ void Chamber::Place_PhaseII_On_the_Top(G4LogicalVolume* world)
leafY = -22.15*mm;
}
//the z-translation
- leafZ = geLeaf_PosZ;
+ //leafZ = geLeaf_PosZ;
//physiGeLeaf_CloverT[l] = new G4PVPlacement(rmC, //rotation
@@ -2653,7 +2645,7 @@ void Chamber::Place_GREAT_Left_and_Right(G4LogicalVolume* world)
G4double dPos = fGeLeaf_dX_GREAT + fGapBetweenLeaves_GREAT/2.;
G4double leafX;
G4double leafY;
- G4double leafZ;
+ //G4double leafZ;
//Keep track of which detectors are used
//G4String detName[2] = {"CloverR","CloverL"}; //Looking upstream
@@ -2677,7 +2669,7 @@ void Chamber::Place_GREAT_Left_and_Right(G4LogicalVolume* world)
leafY = -dPos;
}
//the z-translation
- leafZ = geLeaf_PosZ;
+ //leafZ = geLeaf_PosZ;
//for(G4int det = prevNumber; det < numberOfClovers; det++) {
@@ -3209,8 +3201,7 @@ void Chamber::CreateCloverIISolids()
G4double GeDepth = 15.00 * mm; //Hole dirilled to this far from face
G4double passiveThick = 0.5 * mm; //fPassiveThick_PhaseII; //passivated Ge
G4double contactThick = fContactThick_PhaseII; //Li contact
- G4double innerRHole;
- innerRHole = 0.00 * mm;
+ //G4double innerRHole = 0.00 * mm;
G4double holeR = fHoleR_PhaseII;
G4double contactR = holeR + contactThick;
G4double passiveR = contactR + passiveThick;
@@ -3427,8 +3418,7 @@ void Chamber::CreateGREATCloverSolids()
G4double passiveThick = 0.30 * mm; //passivated Ge
G4double contactThick = 0.50 * mm; //Li contact
- G4double innerRHole;
- innerRHole= 0.00 * mm;
+ //G4double innerRHole = 0.00 * mm;
G4double holeR = 5.00 * mm; //fHoleR_PhaseII;
G4double contactR = holeR + contactThick;
G4double passiveR = contactR + passiveThick;
diff --git a/NPSimulation/Core/NPIonIonInelasticPhysic.cc b/NPSimulation/Core/NPIonIonInelasticPhysic.cc
index 1813d87a8a891da20a8f2a2f834ff20eab8146b5..c054ef5d1a3811b6ed48d9534d87d71641d8f7ca 100755
--- a/NPSimulation/Core/NPIonIonInelasticPhysic.cc
+++ b/NPSimulation/Core/NPIonIonInelasticPhysic.cc
@@ -100,11 +100,11 @@ void NPIonIonInelasticPhysic::ConstructProcess()
//G4GeneralSpaceNNCrossSection* GeneralSpaceNNCrossSection = new G4GeneralSpaceNNCrossSection;
// Tripathi
- G4TripathiCrossSection* TripathiCrossSections = new G4TripathiCrossSection;
+ //G4TripathiCrossSection* TripathiCrossSections = new G4TripathiCrossSection;
G4TripathiLightCrossSection* TripathiLightCrossSections = new G4TripathiLightCrossSection;
//Shen
- G4IonsShenCrossSection* ShenCrossSections = new G4IonsShenCrossSection;
+ //G4IonsShenCrossSection* ShenCrossSections = new G4IonsShenCrossSection;
// Glauber
G4ComponentGGHadronNucleusXsc* GlauberGribovCrossSection = new G4ComponentGGHadronNucleusXsc();
diff --git a/NPSimulation/Detectors/Sharc/Sharc.cc b/NPSimulation/Detectors/Sharc/Sharc.cc
index b56ae924eab567ddebb363effc34ab4eb45cab4b..7a7cea05b50943c2717df600559006b04a44237b 100644
--- a/NPSimulation/Detectors/Sharc/Sharc.cc
+++ b/NPSimulation/Detectors/Sharc/Sharc.cc
@@ -354,9 +354,8 @@ void Sharc::ConstructTargetFan(G4LogicalVolume* world){
G4double FanPlateHole_InnerRadius = 18*mm;
G4double FanPlate_Thickness = 3*mm;
- G4double TargetFrame_Thickness;
- TargetFrame_Thickness= 0.5*mm;
- TargetFrame_Thickness=0;
+ //G4double TargetFrame_Thickness;
+ //TargetFrame_Thickness= 0.5*mm;
G4double Fan_Shift = 70*mm+16*mm;
G4Tubs* FanBaseSolid= new G4Tubs("TargetFanBase" ,
diff --git a/NPSimulation/Detectors/Spice/Spice.cc b/NPSimulation/Detectors/Spice/Spice.cc
index 0cf3c112a29c62975884324a55dc61687ec51d88..b21b81b19ea872a99a9e89cbae0523c04080a076 100644
--- a/NPSimulation/Detectors/Spice/Spice.cc
+++ b/NPSimulation/Detectors/Spice/Spice.cc
@@ -167,7 +167,8 @@ void Spice::InitializeRootOutput(){
// Read sensitive part and fill the Root tree.
// Called at in the EventAction::EndOfEventAvtion
void Spice::ReadSensitive(const G4Event* event){
- event = 0;
+ if(event)
+ event = 0;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/NPSimulation/Detectors/TRex/TRex.cc b/NPSimulation/Detectors/TRex/TRex.cc
index 2becc7af05d2c1060d4b655c24148c8f9d27cc3c..b8b13fb58a46f0fa6b71fcd5e884ce8f9be6dee9 100644
--- a/NPSimulation/Detectors/TRex/TRex.cc
+++ b/NPSimulation/Detectors/TRex/TRex.cc
@@ -154,7 +154,9 @@ void TRex::ReadConfiguration(string Path){
string LineBuffer;
string DataBuffer;
- double X,Y,Z;
+ double X=0;
+ double Y=0;
+ double Z=0;
bool check_X = false ;
bool check_Y = false ;
bool check_Z = false ;