Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bill #4

Merged
merged 37 commits into from
May 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
178c895
Before pull Stevens pull request
billlee77 Mar 5, 2020
e294925
Merge branch 'master' of github.com:billlee77/DEMPgen
billlee77 Mar 5, 2020
d7f9912
Merge branch 'master' of github.com:billlee77/DEMPgen
billlee77 Mar 6, 2020
42e45e3
adding feed in the json file
billlee77 Mar 6, 2020
6af0efb
Different processes are writted in the different modular fashion
billlee77 Mar 29, 2020
9d6d5c1
EIC sub process routine is implemented
billlee77 Mar 31, 2020
d3af0db
Changes: 1. Random number Generator is declared at each sub process r…
billlee77 Apr 1, 2020
e74d2a2
Modified luminosity and crossing angle to correctly match the eRHIC s…
sjdkay May 12, 2020
71c4ddd
Fixed segmentation fault with pi0 plugin
billlee77 May 18, 2020
a9f4271
Fixed neutron momentum output in MeV: r_l_scat_nucleon->r_l_scat_nucl…
billlee77 May 20, 2020
5f91b7a
Merging in updates from bill
sjdkay May 20, 2020
e7927a9
Fixed the luminosity was incorrectly defined
billlee77 May 21, 2020
da40b69
Trying the original random number generator
billlee77 May 22, 2020
524e68e
Merged in updates from Bill
sjdkay May 23, 2020
6cb6fb0
Fixed the Particle output for pion in the output file and generator seed
billlee77 May 26, 2020
ca64ca7
Merge branch 'bill' of https://github.com/billlee77/DEMPgen into bill
sjdkay May 28, 2020
6fdb83d
SetSeed is turned off, no seed is set.
billlee77 Jun 8, 2020
8902b5b
Quick test .json file
sjdkay Jun 8, 2020
bb00a7a
Merge branch 'bill' of https://github.com/billlee77/DEMPgen into bill
sjdkay Jun 8, 2020
08f85c3
Added some notes for reference on where to modify certain parameters …
sjdkay Nov 26, 2020
0c6e818
1. IP6 and IP8 crossing angle phase implemented. 2. TRand2 changed to…
billlee77 Apr 14, 2021
7e0840b
PiPlus module fixed and configuration file for pi0 is added.
billlee77 May 8, 2021
35ee1cc
Merge branch 'billlee77:bill' into bill
sjdkay May 10, 2021
6b315d1
Updates to batch scripts. Removed crossing angle
sjdkay May 10, 2021
4da30e3
Updated default config script to include interaction point
sjdkay May 10, 2021
a443800
Modification made so that Json can handle large member to allow 10B e…
billlee77 May 10, 2021
33d8d5a
unsigned integer now implemented for Json and tested, can handel 10B …
billlee77 May 10, 2021
80ce556
Merged in updates from Bill, should be able to handle 10B events now.…
sjdkay May 10, 2021
20d8e5f
Added in new EventWeightCeil value. Will be used to determine unit we…
sjdkay May 11, 2021
17f67e9
New energy combo specific run scripts to avoid overwriting names. Imp…
sjdkay May 13, 2021
ba14c67
Unit weight calculation for PiPlus added in
sjdkay May 21, 2021
20b822f
Before merging
billlee77 May 21, 2021
944cef0
Merge branch 'bill' into UnitWeight
billlee77 May 21, 2021
b675264
Merge pull request #3 from sjdkay/UnitWeight
billlee77 May 21, 2021
9879e1a
before merging
billlee77 May 21, 2021
e7c722c
Merge branch 'bill' into bill2
billlee77 May 21, 2021
f535daf
PiPlus EIC-smear output implemented
billlee77 May 21, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
data/LundFiles/
data/RootFiles/
data/LundFiles
*.root
*.lund
build/
*_job.txt
Config_EIC_*
Config_EIC_*
sjdkay_job.txt
*#*
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ find_package(ROOT REQUIRED COMPONENTS RIO Net Tree)
include(${ROOT_USE_FILE})

include_directories(include)
include_directories("src/eic_evgen")
include_directories(SYSTEM ${ROOT_INCLUDE_DIRS})
#include_directories(include/json)

file(GLOB SOURCES "src/*" "src/eic_evgen/eic.cc" "src/eic_evgen/eic_pim.cc" "src/eic_evgen/tssa_sig_Para.cc")
file(GLOB SOURCES "src/*" "src/eic_evgen/eic.cc" "src/eic_evgen/eic_pim.cc" "src/eic_evgen/tssa_sig_Para.cc" "src/eic_evgen/reaction_rountine.cc" "src/eic_evgen/legacy_function.cc" "src/eic_evgen/legacy_function.cc" "src/eic_evgen/process_routine/*")
# file(GLOB SOURCES "src/*.cpp")

message("Root Include Dirs: " ${ROOT_INCLUDE_DIRS})
Expand Down
10 changes: 6 additions & 4 deletions Config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
// and degrees for angles.
// n_events indicates number of attempts
// "experiment" : "eic" or "solid"
//"experiment" : "solid",
// "experiment" : "solid",
// "output_file" : "RootFiles/Test.root",

"experiment" : "eic",

// "file_name" : "example_output",
"n_events" : 10000,
// "output_file" : "RootFiles/Test.root",
"file_name" : "example_output",
"n_events" : 1000000,
"generator_seed": 1234567,

//**************************************
/// This section if for EIC simulation only
Expand Down
12 changes: 10 additions & 2 deletions Config_EIC.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,22 @@
// "experiment" : "solid",
"experiment" : "eic",

"file_name" : "DEMPGen_1000000_1",
"n_events" : 1000000,
"file_name" : "DEMPGen_PionPlus_org",
// "file_name" : "DEMPGen_PionPlus_test",
"n_events" : 100000000,
"output_file" : "RootFiles/Test.root",
"generator_seed": 1234567,

//**************************************
/// This section if for EIC simulation only
"Targ_dir" : 1, // Target Direction (1->Up, 2->Down)
"Kinematics_type" : 1, // Kinematics type (1->FF, 2->TSSA)
// "particle": "omega", // Choices: omega, pi+, pi0
//"particle": "omega", // Choices: omega, pi+, pi0
"particle": "Pion+", // Choices: omega, pi+, pi0
//"particle": "Pi0", // Choices: omega, pi+, pi0
//"particle": "Pi0", // Choices: omega, pi+, pi0
"det_location": "ip8", // choices: ip6 for STAR, ip8 for PHENIX

//**************************************
/// This section is Solid only
Expand Down
53 changes: 53 additions & 0 deletions Config_EIC.json.original
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
// This is an exmaple Json configuration file that will accept
// parameters for both EIC and Solid simulation.
//Config
// All values should use units of MeV for energies and momenta,
// and degrees for angles.
// n_events indicates number of attempts
// "experiment" : "eic" or "solid"
// "experiment" : "solid",
"experiment" : "eic",

"file_name" : "DEMPGen_PionPlus_org",
// "file_name" : "DEMPGen_PionPlus_test",
"n_events" : 100000000,
"output_file" : "RootFiles/Test.root",
"generator_seed": 1234567,

//**************************************
/// This section if for EIC simulation only
"Targ_dir" : 1, // Target Direction (1->Up, 2->Down)
"Kinematics_type" : 1, // Kinematics type (1->FF, 2->TSSA)
// "particle": "omega", // Choices: omega, pi+, pi0
//"particle": "omega", // Choices: omega, pi+, pi0
"particle": "Pion+", // Choices: omega, pi+, pi0
//"particle": "Pi0", // Choices: omega, pi+, pi0
//"particle": "Pi0", // Choices: omega, pi+, pi0

//**************************************
/// This section is Solid only

"beam_energy": 11000,
"targ_pol_x": 0,
"targ_pol_y": 0,
"targ_pol_z": 0,
"scat_elec_Emin": 1100.0,
"scat_elec_Emax": 9900.0,
"scat_elec_thetamin": 5.0,
"scat_elec_thetamax": 27.0,
"prod_pion_thetamin": 5.0,
"prod_pion_thetamax": 20.0,
"multiple_scattering": false,
"ionization": false,
"bremsstrahlung": false,
"final_state_interaction": false,
"fermi_momentum": false,
"weight_cut": true,
"w_cut": true,
"w_min": 2,
"Qsq_cut": true,
"Qsq_min": 5,
"t_cut": true,
"t_min": -0.5
}
59 changes: 59 additions & 0 deletions Config_EIC_Pi0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
// This is an exmaple Json configuration file that will accept
// parameters for both EIC and Solid simulation.
//Config
// All values should use units of MeV for energies and momenta,
// and degrees for angles.
// n_events indicates number of attempts
// "experiment" : "eic" or "solid"
// "experiment" : "solid",
"experiment" : "eic",

"file_name" : "DEMPGen_Pion0_decay",
// "file_name" : "DEMPGen_PionPlus_test",
"n_events" : 1000000,
"output_file" : "RootFiles/Test.root",
"generator_seed": 1234567,

//**************************************
/// This section if for EIC simulation only
"Targ_dir" : 1, // Target Direction (1->Up, 2->Down)
"Kinematics_type" : 1, // Kinematics type (1->FF, 2->TSSA)
// "particle": "omega", // Choices: omega, pi+, pi0
//"particle": "omega", // Choices: omega, pi+, pi0
//"particle": "Pion+", // Choices: omega, pi+, pi0
//"particle": "Pi0", // Choices: omega, pi+, pi0
"particle": "Pi0", // Choices: omega, pi+, pi0
"pi0_decay": true, //
"det_location": "ip8", // choices: ip6 for STAR, ip8 for PHENIX
// Default choice: ip8
// Attention: IF you donot know which to detection location to use,
// then please use ip8 as default
// "pi0_decay": false,

//**************************************
/// This section is Solid only

"beam_energy": 11000,
"targ_pol_x": 0,
"targ_pol_y": 0,
"targ_pol_z": 0,
"scat_elec_Emin": 1100.0,
"scat_elec_Emax": 9900.0,
"scat_elec_thetamin": 5.0,
"scat_elec_thetamax": 27.0,
"prod_pion_thetamin": 5.0,
"prod_pion_thetamax": 20.0,
"multiple_scattering": false,
"ionization": false,
"bremsstrahlung": false,
"final_state_interaction": false,
"fermi_momentum": false,
"weight_cut": true,
"w_cut": true,
"w_min": 2,
"Qsq_cut": true,
"Qsq_min": 4,
"t_cut": true,
"t_min": -1.2
}
58 changes: 58 additions & 0 deletions Config_EIC_Pi0_decay.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
// This is an exmaple Json configuration file that will accept
// parameters for both EIC and Solid simulation.
//Config
// All values should use units of MeV for energies and momenta,
// and degrees for angles.
// n_events indicates number of attempts
// "experiment" : "eic" or "solid"
// "experiment" : "solid",
"experiment" : "eic",

"file_name" : "DEMPGen_Pi0_decay",
// "file_name" : "DEMPGen_PionPlus_test",
// "n_events" : 100000000,
"n_events" : 2000,
"output_file" : "RootFiles/Test.root",
"generator_seed": 1234567,

//**************************************
/// This section if for EIC simulation only
"Targ_dir" : 1, // Target Direction (1->Up, 2->Down)
"Kinematics_type" : 1, // Kinematics type (1->FF, 2->TSSA)
// "particle": "omega", // Choices: omega, pi+, pi0
//"particle": "omega", // Choices: omega, pi+, pi0
//"particle": "Pion+", // Choices: omega, pi+, pi0
//"particle": "Pi0", // Choices: omega, pi+, pi0
"particle": "Pi0", // Choices: omega, pi+, pi0
"pi0_decay": true, //
"det_location": "ip8", // choices: ip6 for STAR, ip8 for PHENIX
// Default choice: ip8
// Attention: IF you donot know which to detection location to use,
// then please use ip8 as default
//**************************************
/// This section is Solid only

"beam_energy": 11000,
"targ_pol_x": 0,
"targ_pol_y": 0,
"targ_pol_z": 0,
"scat_elec_Emin": 1100.0,
"scat_elec_Emax": 9900.0,
"scat_elec_thetamin": 5.0,
"scat_elec_thetamax": 27.0,
"prod_pion_thetamin": 5.0,
"prod_pion_thetamax": 20.0,
"multiple_scattering": false,
"ionization": false,
"bremsstrahlung": false,
"final_state_interaction": false,
"fermi_momentum": false,
"weight_cut": true,
"w_cut": true,
"w_min": 2,
"Qsq_cut": true,
"Qsq_min": 4,
"t_cut": true,
"t_min": -1.2
}
60 changes: 60 additions & 0 deletions Config_EIC_Pi0_no_decay.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
// This is an exmaple Json configuration file that will accept
// parameters for both EIC and Solid simulation.
//Config
// All values should use units of MeV for energies and momenta,
// and degrees for angles.
// n_events indicates number of attempts
// "experiment" : "eic" or "solid"
// "experiment" : "solid",
"experiment" : "eic",

"file_name" : "DEMPGen_Pion0_no_decay",
// "file_name" : "DEMPGen_PionPlus_test",
// "n_events" : 50000, // Per file size under 500k, due to g4e capability
// "n_events" : 85000, // Per file size under 500k, due to g4e capability
"n_events" : 10, // Per file size under 500k, due to g4e capability
// "n_events" : 10000,
"output_file" : "RootFiles/Test.root",
"generator_seed": 6423,

//**************************************
/// This section if for EIC simulation only
"Targ_dir" : 1, // Target Direction (1->Up, 2->Down)
"Kinematics_type" : 1, // Kinematics type (1->FF, 2->TSSA)
// "particle": "omega", // Choices: omega, pi+, pi0
//"particle": "omega", // Choices: omega, pi+, pi0
//"particle": "Pion+", // Choices: omega, pi+, pi0
//"particle": "Pi0", // Choices: omega, pi+, pi0
"particle": "Pi0", // Choices: omega, pi+, pi0
"pi0_decay": false, //
"det_location": "ip8", // choices: ip6 for STAR, ip8 for PHENIX
// Default choice: ip8
// Attention: IF you donot know which to detection location to use,
// then please use ip8 as default
//**************************************
/// This section is Solid only

"beam_energy": 11000,
"targ_pol_x": 0,
"targ_pol_y": 0,
"targ_pol_z": 0,
"scat_elec_Emin": 1100.0,
"scat_elec_Emax": 9900.0,
"scat_elec_thetamin": 5.0,
"scat_elec_thetamax": 27.0,
"prod_pion_thetamin": 5.0,
"prod_pion_thetamax": 20.0,
"multiple_scattering": false,
"ionization": false,
"bremsstrahlung": false,
"final_state_interaction": false,
"fermi_momentum": false,
"weight_cut": true,
"w_cut": true,
"w_min": 2,
"Qsq_cut": true,
"Qsq_min": 4,
"t_cut": true,
"t_min": -1.2
}
54 changes: 54 additions & 0 deletions Config_EIC_PiPlus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
// This is an exmaple Json configuration file that will accept
// parameters for both EIC and Solid simulation.
//Config
// All values should use units of MeV for energies and momenta,
// and degrees for angles.
// n_events indicates number of attempts
// "experiment" : "eic" or "solid"
// "experiment" : "solid",
"experiment" : "eic",

"file_name" : "DEMPGen_PionPlus_org",
// "file_name" : "DEMPGen_PionPlus_test",
"n_events" : 100000000,
"output_file" : "RootFiles/Test.root",
"generator_seed": 32059008,

//**************************************
/// This section if for EIC simulation only
"Targ_dir" : 1, // Target Direction (1->Up, 2->Down)
"Kinematics_type" : 1, // Kinematics type (1->FF, 2->TSSA)
// "particle": "omega", // Choices: omega, pi+, pi0
//"particle": "omega", // Choices: omega, pi+, pi0
//"particle": "Pion+", // Choices: omega, pi+, pi0
//"particle": "Pi0", // Choices: omega, pi+, pi0

"particle": "Pi+", // Choices: omega, pi+, pi0

//**************************************
/// This section is Solid only

"beam_energy": 11000,
"targ_pol_x": 0,
"targ_pol_y": 0,
"targ_pol_z": 0,
"scat_elec_Emin": 1100.0,
"scat_elec_Emax": 9900.0,
"scat_elec_thetamin": 5.0,
"scat_elec_thetamax": 27.0,
"prod_pion_thetamin": 5.0,
"prod_pion_thetamax": 20.0,
"multiple_scattering": false,
"ionization": false,
"bremsstrahlung": false,
"final_state_interaction": false,
"fermi_momentum": false,
"weight_cut": true,
"w_cut": true,
"w_min": 2,
"Qsq_cut": true,
"Qsq_min": 4,
"t_cut": true,
"t_min": -1.2
}
18 changes: 18 additions & 0 deletions New_Config_EIC.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
// This is an exmaple Json configuration file that will accept
// parameters for both EIC and Solid simulation.
//Config
// All values should use units of MeV for energies and momenta,
// and degrees for angles.
// n_events indicates number of attempts
"experiment" : "eic",

"file_name" : "DEMPGen_PionPlus_org",
"n_events" : 100000000,
"output_file" : "RootFiles/Test.root",
"generator_seed": 1234567,
"Targ_dir" : 1, // Target Direction (1->Up, 2->Down)
"Kinematics_type" : 1, // Kinematics type (1->FF, 2->TSSA)
"particle": "Pion+", // Choices: omega, pi+, pi0

}
Loading