From d59e7703063a4dddeec7184b5c7f18bb00aa7c7e Mon Sep 17 00:00:00 2001
From: Elidiano Tronchin <elidiano.tronchin@gmail.com>
Date: Wed, 30 Jan 2019 17:04:43 +0100
Subject: [PATCH] * Updating EventGeneratorCosmic
---
.../EventGenerator/EventGeneratorCosmic.cc | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/NPSimulation/EventGenerator/EventGeneratorCosmic.cc b/NPSimulation/EventGenerator/EventGeneratorCosmic.cc
index fa19c0ef8..a2c45bb90 100644
--- a/NPSimulation/EventGenerator/EventGeneratorCosmic.cc
+++ b/NPSimulation/EventGenerator/EventGeneratorCosmic.cc
@@ -146,19 +146,15 @@ void EventGeneratorCosmic::ReadConfiguration(NPL::InputParser parser){
G4double randomize1=0, randomize2=0 ;
G4double momentum_y = 0;
G4double angle = 0;
-//<<<<<<< HEAD
TF1* cosSq= new TF1("cosSq", "TMath::Power(cos(x),2)", 0, (TMath::Pi())/2.);
-//TH1F* DistribCosmicAngle= new TH1F("DistribCosmicAngle","DistribCosmicAngle",100, 0, (TMath::Pi())/2);
-//TH2F* DistribMomZMomX= new TH2F("DistribMomZMomX","Horizontals components of Cosmic rays Momentums",50, -1, 1, 50, -1, 1);
-//TCanvas* DisCanva = new TCanvas("DisCanva","Distribution");
-//DisCanva->Divide(1,2);
-//=======
-// TF1* cosSq2= new TF1("cosSq2", "TMath::Power(cos(x),2)", 0, (TMath::Pi())/2);
-//>>>>>>> d95a3e0b20133cedfe52319767a19f987db3584a
+ //TH1F* DistribCosmicAngle= new TH1F("DistribCosmicAngle","DistribCosmicAngle",100, 0, (TMath::Pi())/2);
+ //TH2F* DistribMomZMomX= new TH2F("DistribMomZMomX","Horizontals components of Cosmic rays Momentums",50, -1, 1, 50, -1, 1);
+ //TCanvas* DisCanva = new TCanvas("DisCanva","Distribution");
+ //DisCanva->Divide(1,2);
void EventGeneratorCosmic::GenerateEvent(G4Event*){
-
+
for(auto& par : m_Parameters) {
for(unsigned int p=0; p<par.m_particleName.size(); p++){
for(int i=0; i<par.m_Multiplicty[p]; i++){
@@ -229,8 +225,6 @@ void EventGeneratorCosmic::GenerateEvent(G4Event*){
//DistribMomZMomX->Fill(momentum_x,momentum_z);
//DistribCosmicAngle->Fill(CosmicAngle);
-
-
Particle particle(par.m_particle, 0,particle_energy,G4ThreeVector(momentum_x, momentum_y, momentum_z),G4ThreeVector(x0, par.m_y0, z0));
--
GitLab