From 3c1e5da8daf1b462ec1df6413e2ce1ee8363dbe0 Mon Sep 17 00:00:00 2001 From: hiro98 Date: Wed, 27 May 2020 21:40:09 +0200 Subject: [PATCH] finx port and some layout issues --- latex/tex/monte-carlo/sampling.tex | 12 +++++----- latex/tex/pdf/results.tex | 17 +++++++------- notes.org | 3 ++- prog/runcards/pp_phaeno_299_port/makefile | 2 +- .../qqgg_proton/MC_DIPHOTON_PROTON.cc | 14 +++++------- .../runcards/with_jets/Sherpa_Ext.dat | 1 + .../runcards/with_jets/plot.flags | 2 +- .../runcards/with_jets_and_pT/Sherpa_Ext.dat | 1 + .../runcards/with_jets_and_pT/plot.flags | 2 +- .../with_pT_and_fragmentation/Sherpa_Ext.dat | 1 + .../with_pT_and_fragmentation/Sherpa_Ext.yaml | 21 ------------------ .../with_pT_and_fragmentation/plot.flags | 2 +- .../Sherpa_Ext.dat | 1 + .../Sherpa_Ext.yaml | 22 ------------------- .../plot.flags | 2 +- 15 files changed, 31 insertions(+), 72 deletions(-) delete mode 100644 prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/Sherpa_Ext.yaml delete mode 100644 prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/Sherpa_Ext.yaml diff --git a/latex/tex/monte-carlo/sampling.tex b/latex/tex/monte-carlo/sampling.tex index 06035f9..ed00694 100644 --- a/latex/tex/monte-carlo/sampling.tex +++ b/latex/tex/monte-carlo/sampling.tex @@ -82,6 +82,12 @@ and the total probability of accepting a sample (efficiency The closer the volumes enclosed by \(g\) and \(f\) are to each other, higher is \(\mathfrak{e}\). This method is called importance sampling +\begin{wrapfigure}[15]{l}{.5\textwidth} + \plot{xs_sampling/upper_bound} + \caption{\label{fig:distcos} The distribution \cref{eq:distcos} and an upper bound of + the form \(a + b\cdot x^2\).} +\end{wrapfigure} + Choosing \(g\) like \cref{eq:primitiveg} and looking back at \cref{eq:solutionsamp} yields \(y = x\cdot A\), so that the sampling procedure simplifies to choosing random numbers \(x\in [0,1]\) and @@ -112,12 +118,6 @@ This very low efficiency stems from the fact, that \(f_{\cos\theta}\) is a lot smaller than its upper bound for most of the sampling interval. -\begin{wrapfigure}[15]{l}{.5\textwidth} - \plot{xs_sampling/upper_bound} - \caption{\label{fig:distcos} The distribution \cref{eq:distcos} and an upper bound of - the form \(a + b\cdot x^2\).} -\end{wrapfigure} - Utilizing an upper bound of the form \(a + b\cdot x^2\) with \(a, b\) constant improves the efficiency to~\result{xs/python/tuned_th_samp}. The distribution, as well as the diff --git a/latex/tex/pdf/results.tex b/latex/tex/pdf/results.tex index 87a0793..9e01a23 100644 --- a/latex/tex/pdf/results.tex +++ b/latex/tex/pdf/results.tex @@ -167,18 +167,15 @@ considerably. % TODO: diskussion? why is that., mentioned thest w/o cuts \centering \begin{subfigure}{.49\textwidth} \centering \plot{pdf/eta_hist} - \caption{\label{fig:pdf-eta} \(\eta\) - distribution.} + \caption{\label{fig:pdf-eta} \(\eta\) distribution.} \end{subfigure} \begin{subfigure}{.49\textwidth} \centering \plot{pdf/pt_hist} - \caption{\label{fig:pdf-pt} \(\pt\) - distribution.} + \caption{\label{fig:pdf-pt} \(\pt\) distribution.} \end{subfigure} \begin{subfigure}{.49\textwidth} \centering \plot{pdf/cos_theta_hist} - \caption{\label{fig:pdf-cos-theta} \(\cos\theta\) - distribution.} + \caption{\label{fig:pdf-cos-theta} \(\cos\theta\) distribution.} \end{subfigure} \begin{subfigure}{.49\textwidth} \centering \plot{pdf/inv_m_hist} @@ -188,6 +185,10 @@ considerably. % TODO: diskussion? why is that., mentioned thest w/o cuts % energy of the partonic system before the scattering. } \end{subfigure} +\end{figure} + +\begin{figure} + \ContinuedFloat \begin{subfigure}{.49\textwidth} \centering \plot{pdf/o_angle_cs_hist} \caption{\label{fig:pdf-o-angle-cs} Scattering angle of the two @@ -195,8 +196,8 @@ considerably. % TODO: diskussion? why is that., mentioned thest w/o cuts \end{subfigure} \begin{subfigure}{.49\textwidth} \centering \plot{pdf/o_angle_hist} - \caption{\label{fig:pdf-o-angle} Scattering - angle of the two photons in the lab frame.} + \caption{\label{fig:pdf-o-angle} Scattering angle of the two + photons in the lab frame.} \end{subfigure} \caption{\label{fig:pdf-histos}Comparison of histograms of observables for \(\ppgg\) generated manually and by \sherpa/\rivet diff --git a/notes.org b/notes.org index e1c503e..81a25e8 100644 --- a/notes.org +++ b/notes.org @@ -114,7 +114,8 @@ Viele Gruesse, Frank - pT only works with showers - remnants of proton create showers -> without fragmentation: no hadrons - can create more photons -**** + - limited -> conserves m_yy + - Other recoil scheme [[https://sherpa-team.gitlab.io/sherpa/master/manual/parameters/parton-showers.html#cs-shower-options][CSS_KIN_SCHEME=0]] could fix that *** TODO Fragmentation, - https://sherpa-team.gitlab.io/sherpa/master/manual/parameters/hadronization.html?highlight=fragmentation#id18 - showers recombinate to hadrons diff --git a/prog/runcards/pp_phaeno_299_port/makefile b/prog/runcards/pp_phaeno_299_port/makefile index 9e37aa5..1fa55d5 100644 --- a/prog/runcards/pp_phaeno_299_port/makefile +++ b/prog/runcards/pp_phaeno_299_port/makefile @@ -15,7 +15,7 @@ ANALYSIS_SO_NAME = RivetMcDiphotonProton OUT_DIR = out # Event Count -EVENT_COUNT = 100000 +EVENT_COUNT = 1000000 # List of Runcards, see RUNCARD_FOLDER RUNCARDS = with_pT_and_fragmentation_and_mi with_pT_and_fragmentation basic with_jets with_jets_and_pT diff --git a/prog/runcards/pp_phaeno_299_port/qqgg_proton/MC_DIPHOTON_PROTON.cc b/prog/runcards/pp_phaeno_299_port/qqgg_proton/MC_DIPHOTON_PROTON.cc index 889ed2b..28ca8a4 100644 --- a/prog/runcards/pp_phaeno_299_port/qqgg_proton/MC_DIPHOTON_PROTON.cc +++ b/prog/runcards/pp_phaeno_299_port/qqgg_proton/MC_DIPHOTON_PROTON.cc @@ -56,10 +56,10 @@ public: double min_pT = 20; double eta = 2.5; - _observables = {{"pT", {min_pT, energy, 50, true}}, + _observables = {{"pT", {min_pT, energy / 2, 50, true}}, {"eta", {-eta, eta}}, {"cos_theta", {-1, 1}}, - {"inv_m", {0.1, 2 * energy, 50, true}}, + {"inv_m", {2 * min_pT, 2 * energy, 50, true}}, {"o_angle", {0, 1}}, {"o_angle_cs", {0, 1}}, {"total_pT", {.01, 2 * energy, 50, true}}}; @@ -121,22 +121,18 @@ public: _observables.at("cos_theta").fill(cos(photon.theta())); const auto &moms = photons.moms(); - const auto total_momentum = - std::accumulate(moms.begin(), moms.end(), FourMomentum(0, 0, 0, 0)); - + const auto total_momentum = moms[0] + moms[1]; + _observables.at("total_pT").fill(total_momentum.pT()); _observables.at("inv_m").fill(total_momentum.mass()); + _observables.at("o_angle").fill( std::abs(tanh((photons[1].eta() - photons[0].eta()) / 2))); - // std::abs(photons[0].theta() + photons[1].theta()); - _observables.at("o_angle_cs").fill(std::abs( sinh((photons[0].eta() - photons[1].eta())) * 2.0 * photons[0].pT() * photons[1].pT() / sqrt(sqr(_observables.at("inv_m")._value) + sqr(total_momentum.pT())) / _observables.at("inv_m")._value)); - - _observables.at("total_pT").fill(total_momentum.pT()); } //@} diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_jets/Sherpa_Ext.dat b/prog/runcards/pp_phaeno_299_port/runcards/with_jets/Sherpa_Ext.dat index 02f9e1c..b25d551 100644 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_jets/Sherpa_Ext.dat +++ b/prog/runcards/pp_phaeno_299_port/runcards/with_jets/Sherpa_Ext.dat @@ -1,5 +1,6 @@ EW_SCHEME 0; FRAGMENTATION Off; SHOWER_GENERATOR CSS; +CSS_KIN_SCHEME 0 MI_HANDLER None; BEAM_REMNANTS 0; diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_jets/plot.flags b/prog/runcards/pp_phaeno_299_port/runcards/with_jets/plot.flags index d8f7a12..fb4606c 100644 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_jets/plot.flags +++ b/prog/runcards/pp_phaeno_299_port/runcards/with_jets/plot.flags @@ -1 +1 @@ -Title=Jets and Showers +Title=PS diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_jets_and_pT/Sherpa_Ext.dat b/prog/runcards/pp_phaeno_299_port/runcards/with_jets_and_pT/Sherpa_Ext.dat index e20b5fc..af40612 100644 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_jets_and_pT/Sherpa_Ext.dat +++ b/prog/runcards/pp_phaeno_299_port/runcards/with_jets_and_pT/Sherpa_Ext.dat @@ -1,5 +1,6 @@ EW_SCHEME 0; FRAGMENTATION Off; SHOWER_GENERATOR CSS; +CSS_KIN_SCHEME=0 MI_HANDLER None; BEAM_REMNANTS 1; diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_jets_and_pT/plot.flags b/prog/runcards/pp_phaeno_299_port/runcards/with_jets_and_pT/plot.flags index 0fce39c..516fd67 100644 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_jets_and_pT/plot.flags +++ b/prog/runcards/pp_phaeno_299_port/runcards/with_jets_and_pT/plot.flags @@ -1 +1 @@ -Title=Jets + Primordial $\kt$ +Title=PS + Remnants + Primordial $\kt$ diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/Sherpa_Ext.dat b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/Sherpa_Ext.dat index 2402f23..b14a55f 100644 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/Sherpa_Ext.dat +++ b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/Sherpa_Ext.dat @@ -1,5 +1,6 @@ EW_SCHEME 0; FRAGMENTATION Ahadic; +CSS_KIN_SCHEME=0; SHOWER_GENERATOR CSS; MI_HANDLER None; BEAM_REMNANTS 1; diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/Sherpa_Ext.yaml b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/Sherpa_Ext.yaml deleted file mode 100644 index 77bf0c1..0000000 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/Sherpa_Ext.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# the main scattering process -PROCESSES: -- 94 -94 -> 22 22: - Order: {QCD: 0, EW: 2} - Integration_Error: 0.001 - -# use pure QED -EW_SCHEME: 0 - -# Enable fragmentation -FRAGMENTATION: Lund - -MI_HANDLER: None - -# we explicitly enable transverse momenta -# showers are enabled as well -INTRINSIC_KPERP: - ENABLED: true - -BEAM_REMNANTS: true -SHOWER_GENERATOR: CSS diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/plot.flags b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/plot.flags index c44cafa..42f2205 100644 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/plot.flags +++ b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation/plot.flags @@ -1 +1 @@ -Title=Jets+Primordial+Fragmentation +Title=PS+Primordial+Fragmentation diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/Sherpa_Ext.dat b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/Sherpa_Ext.dat index 7a5a0fb..57a703b 100644 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/Sherpa_Ext.dat +++ b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/Sherpa_Ext.dat @@ -1,5 +1,6 @@ EW_SCHEME 0; FRAGMENTATION Ahadic; SHOWER_GENERATOR CSS; +CSS_KIN_SCHEME=0 MI_HANDLER Amisic; BEAM_REMNANTS 1; diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/Sherpa_Ext.yaml b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/Sherpa_Ext.yaml deleted file mode 100644 index 77da527..0000000 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/Sherpa_Ext.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# the main scattering process -PROCESSES: -- 94 -94 -> 22 22: - Order: {QCD: 0, EW: 2} - Integration_Error: 0.001 - -# use pure QED -EW_SCHEME: 0 - -# Enable fragmentation -FRAGMENTATION: Lund - -# and multiple interactions -MI_HANDLER: Amisic - -# we explicitly enable transverse momenta -# showers are enabled as well -INTRINSIC_KPERP: - ENABLED: true - -BEAM_REMNANTS: true -SHOWER_GENERATOR: CSS diff --git a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/plot.flags b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/plot.flags index d73f967..45f37d8 100644 --- a/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/plot.flags +++ b/prog/runcards/pp_phaeno_299_port/runcards/with_pT_and_fragmentation_and_mi/plot.flags @@ -1 +1 @@ -Title=Jets+Primordial+Fragmentation+MI +Title=PS+Primordial+Fragmentation+MI