diff --git a/Inputs/EventGenerator/neutron.source b/Inputs/EventGenerator/neutron.source index 775ce6b4094bea797d822c28198d608bec44ad6b..bcfd9b541581c4f146a69bdd70853ca3bc26e7f9 100644 --- a/Inputs/EventGenerator/neutron.source +++ b/Inputs/EventGenerator/neutron.source @@ -6,14 +6,14 @@ Isotropic EnergyLow= 0.1 EnergyHigh= 12 - EnergyDistribution= flat - %EnergyDistribution= Watt + %EnergyDistribution= flat + EnergyDistribution= Watt %EnergyDistribution= 0.38*sqrt(x)*exp(-x/0.847212) %EnergyDistribution= -0.00372440431*pow(x,6)+0.387617479*pow(x,5)-14.3752948*pow(x,4)+225.888082*pow(x,3)-1555.60583*pow(x,2)+7983.24902*pow(x,1)+9069.96435 %EnergyDistribution= 0.619676*TMath::SinH(sqrt(1.07777*x))*exp(-0.847212*x) %EnergyDistribution= 1.5*TMath::SinH(sqrt(1.3*x))*exp(-0.89*x) HalfOpenAngleMin= 0 - HalfOpenAngleMax= 2 + HalfOpenAngleMax= 180 x0= 0 y0= 0 z0= 0 mm diff --git a/Inputs/EventGenerator/proton.source b/Inputs/EventGenerator/proton.source index e281714a76034aef4623805289e1a55910471548..bd09a018fe5ae03635075ffe75642144b92350f5 100644 --- a/Inputs/EventGenerator/proton.source +++ b/Inputs/EventGenerator/proton.source @@ -4,8 +4,8 @@ % Energy are given in MeV , Position in mm % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Isotropic - EnergyLow= 5 MeV - EnergyHigh= 5 MeV + EnergyLow= 40 MeV + EnergyHigh= 50 MeV EnergyDistribution= flat HalfOpenAngleMin= 0 deg HalfOpenAngleMax= 180 deg diff --git a/NPSimulation/Detectors/FissionChamber/FissionChamber.cc b/NPSimulation/Detectors/FissionChamber/FissionChamber.cc index 0a9c37f68807aa5e6286682da683448deb06b8a3..4b0e80d3dcaea1c5beeba411d66bfac28a4094bd 100644 --- a/NPSimulation/Detectors/FissionChamber/FissionChamber.cc +++ b/NPSimulation/Detectors/FissionChamber/FissionChamber.cc @@ -427,10 +427,10 @@ void FissionChamber::InitializeScorers() { // Otherwise the scorer is initialised vector<int> level; level.push_back(0); G4VPrimitiveScorer* Calorimeter= new CalorimeterScorers::PS_Calorimeter("Calorimeter",level, 0) ; - G4VPrimitiveScorer* Interaction= new InteractionScorers::PS_Interactions("Interaction",ms_InterCoord, 0) ; + //G4VPrimitiveScorer* Interaction= new InteractionScorers::PS_Interactions("Interaction",ms_InterCoord, 0) ; //and register it to the multifunctionnal detector m_FissionChamberScorer->RegisterPrimitive(Calorimeter); - m_FissionChamberScorer->RegisterPrimitive(Interaction); + //m_FissionChamberScorer->RegisterPrimitive(Interaction); G4SDManager::GetSDMpointer()->AddNewDetector(m_FissionChamberScorer) ; } diff --git a/Projects/Vendeta_sim/run.mac b/Projects/Vendeta_sim/run.mac index b379ed9bcf78d80c4a29d004189059437aaa84d3..506556ed2882f22f4f6013ba592297aba63dec25 100644 --- a/Projects/Vendeta_sim/run.mac +++ b/Projects/Vendeta_sim/run.mac @@ -1 +1 @@ -/run/beamOn 10000 +/run/beamOn 100000 diff --git a/Projects/macros/GeometricalEfficiency.C b/Projects/macros/GeometricalEfficiency.C index 9655b7afddfbe9ddacc42377bb0394f7a002d5d7..6fa2a368416dcd797268623930bf4c82ee6adaf0 100644 --- a/Projects/macros/GeometricalEfficiency.C +++ b/Projects/macros/GeometricalEfficiency.C @@ -48,7 +48,7 @@ using namespace std; -void GeometricalEfficiency(const char * fname = "myResult"){ +void GeometricalEfficiency(const char * fname = "test"){ // Open output ROOT file from NPTool simulation run TString path = gSystem->Getenv("NPTOOL"); path += "/Outputs/Simulation/"; @@ -96,7 +96,8 @@ void GeometricalEfficiency(const char * fname = "myResult"){ TCanvas *c0 = new TCanvas("c0", "Distrib",800,800); hEmittTheta->Draw(""); - hDetecTheta->SetMarkerColor(kAzure+7); + hDetecTheta->SetMarkerColor(2); + hDetecTheta->SetLineColor(2); hDetecTheta->Draw("same"); // efficiency in lab frame in % TCanvas *c = new TCanvas("c", "efficiency",800,800); @@ -122,5 +123,10 @@ void GeometricalEfficiency(const char * fname = "myResult"){ TF1* f = new TF1("f",Form("2 * %f * sin(x*%f/180.) *1*%f/180.",M_PI,M_PI,M_PI),0,180); f->Draw("SAME"); c4->Update(); - + + int iInit = hEmittTheta->GetEntries(); + int iDetect = hDetecTheta->GetEntries(); + + double efficiency = (double)iDetect/(double)iInit; + cout << "Total efficiency = " << efficiency*100 << " %" << endl; }