Merge branch 'bill' of https://github.com/billlee77/DEMPgen into bill

billlee77 · May 28, 2020 · ca64ca7 · ca64ca7
2 parents 524e68e + 6cb6fb0
commit ca64ca7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/eic_evgen/process_routine/Pi0_prod.cc b/src/eic_evgen/process_routine/Pi0_prod.cc
@@ -1224,6 +1224,7 @@ void Pi0_Production::Pi0_decay(TLorentzVector pi0_vec) {
 //	cout << "angle: " << l_photon_1_rf.Vect().Angle(l_photon_2_rf.Vect()) * 180.0/fPi 
 //		 << "    " << l_photon_1.Vect().Angle(l_photon_2.Vect()) * 180.0/fPi << endl;
 
+//	exit(0);
 
 
 	double photons_1_sep = (sin(l_photon_1.Vect().Angle(pi0_vec.Vect())) * 32)*100; 

diff --git a/src/eic_evgen/process_routine/PiPlus_prod.cc b/src/eic_evgen/process_routine/PiPlus_prod.cc
@@ -87,8 +87,8 @@ void PiPlus_Production::Init() {
 
 	rParticle_charge = ExtractCharge(rParticle);
 
-	rRand = new TRandom2();	
-	rRand->SetSeed(fSeed);
+//	rRand = new TRandom2();	
+//	rRand->SetSeed(fSeed);
 
 	sTFile = Form("./LundFiles/eic_%s.txt", gfile_name.Data());
    	sLFile= Form("./LundFiles/eic_input_%s.dat", gfile_name.Data());
@@ -131,7 +131,10 @@ void PiPlus_Production::Init() {
     fX_Mass = ParticleMass(produced_X)*1000; //MeV
     fX_Mass_GeV = fX_Mass/1000; //GeV
 
-
+	cout << "asdasd "<< rParticle << "  " << produced_X << "  " << fX_Mass_GeV <<  endl;
+
+
+//	exit(0);	
 
 	if (rParticle_charge = "+" ) {
 
@@ -751,7 +754,8 @@ void PiPlus_Production::Lund_Output() {
      ppiOut << setw(10) << "1" 
  	   << setw(10) << "1" 
  	   << setw(10) << "1" 
- 	   << setw(10) << produced_X 
+// 	   << setw(10) << "11111111111"
+ 	   << setw(10) << PDGtype(produced_X)
  	   << setw(10) << "0" 
  	   << setw(10) << "0" 
  	   << setw(16) << r_lX_g.X()
@@ -809,7 +813,6 @@ void PiPlus_Production::Detail_Output() {
    ppiDetails << "Total events tried                           " << setw(50) << fNGenerated   << endl;
    ppiDetails << "Total events recorded                        " << setw(50) << fNRecorded    << endl;
 
-   ppiDetails << "Seed used for the Random Number Generator    " << setw(50) << fSeed         << endl;
 
    ppiDetails << "Number of events with w more than 10.6       " << setw(50) << w_ev          << endl;
    ppiDetails << "Number of events with wsq negative           " << setw(50) << w_neg_ev      << endl;
@@ -821,6 +824,8 @@ void PiPlus_Production::Detail_Output() {
    ppiDetails << "Number of events with Sigma negative         " << setw(50) << fNSigmaNeg    << endl;
    ppiDetails << "Number of lund events                        " << setw(50) << fLundRecorded << endl;
 
+   ppiDetails << "Seed used for the Random Number Generator    " << setw(50) << fSeed         << endl;
+
 }
 
 /*--------------------------------------------------*/