Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 52897c3a authored by padsley's avatar padsley
Browse files

Update my SP and W1 branch

parent c766a6df
......@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.8)
include(CheckCXXCompilerFlag)
project(NPLib CXX)
set(CMAKE_BUILD_TYPE Release)
set(CMAKE_CXX_STANDARD 11)
# Setting the policy to match Cmake version
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
......
......@@ -202,6 +202,8 @@ double Reaction::ShootRandomThetaCM(){
TH1D* Proj = fDoubleDifferentialCrossSectionHist->ProjectionX("proj",binY,binY);
SetThetaCM( theta=Proj->GetRandom()*deg );
delete Proj;
delete Y;
}
else
SetThetaCM( theta=fCrossSectionHist->GetRandom()*deg );
......@@ -229,6 +231,8 @@ double Reaction::ShootRandomThetaLab(){
TH1D* Proj = fDoubleDifferentialCrossSectionHist->ProjectionX("proj",binY,binY);
SetThetaLab( theta=Proj->GetRandom()*deg );
delete Proj;
delete Y;
}
else
SetThetaLab( theta=fCrossSectionHist->GetRandom()*deg );
......@@ -251,11 +255,6 @@ void Reaction::ShootRandomExcitationEnergy(){
if(fExcitationEnergyHist){
SetExcitation4(fExcitationEnergyHist->GetRandom());
}
// cout << "L225: randy= " << randy->Rndm(0) << endl;
// double Exciting = 9.5+2*randy->Rndm();
// SetExcitation4(9.5+2*randy->Rndm());
// delete randy;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
......
cmake_minimum_required (VERSION 2.8)
include(CheckCXXCompilerFlag)
set(CMAKE_CXX_STANDARD 11)
# Setting the policy to match Cmake version
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
......
......@@ -201,6 +201,16 @@ G4Material* MaterialManager::GetMaterialFromLibrary(string Name,double density){
m_Material[Name]=material;
return material;
}
else if(Name == "CaF2"){
if(!density)
density = 3.18*g / cm3;
G4Material* material = new G4Material("NPS_"+Name, density,2);
material->AddElement(GetElementFromLibrary("Ca"),1);
material->AddElement(GetElementFromLibrary("F"),2);
m_Material[Name]=material;
return material;
}
// Cooling
else if(Name == "N2_liquid"){
......
......@@ -284,7 +284,6 @@ G4double Target::SlowDownBeam(G4ParticleDefinition* Beam,
IncidentEnergy = 0;
break;
}
}
// Target
......@@ -300,7 +299,6 @@ G4double Target::SlowDownBeam(G4ParticleDefinition* Beam,
}
}
if(IncidentEnergy<0) IncidentEnergy = 0 ;
return IncidentEnergy;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment