Commit be47cb10 authored by Frank Krauss's avatar Frank Krauss

updating SVN_Info and .Plo

parent 2a1793cc
#include "ATOOLS/Org/SVN_Info.H"
static ATOOLS::SVN_Info initializer
("AHADIC++/Decays","trunk/SHERPA","31666","a996e1db8b65efc861a3d529d779a078");
("AHADIC++/Decays","trunk/SHERPA","31687M","a996e1db8b65efc861a3d529d779a078");
#include "ATOOLS/Org/SVN_Info.H"
static ATOOLS::SVN_Info initializer
("AHADIC++/Formation","trunk/SHERPA","31666","be09de7e4768456401f2b4e8fb53e6db");
("AHADIC++/Formation","trunk/SHERPA","31687M","eff13a02546659773c20400ee4376be2");
#include "ATOOLS/Org/SVN_Info.H"
static ATOOLS::SVN_Info initializer
("AHADIC++/Main","trunk/SHERPA","31666","6aec0d693c797d36f254e1137a42f6f9");
("AHADIC++/Main","trunk/SHERPA","31687M","1bacd26227d2e46b66b6225eb7f0f7b9");
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#include "ATOOLS/Org/SVN_Info.H"
static ATOOLS::SVN_Info initializer
("AHADIC++/Tools","trunk/SHERPA","31666M","e6a2bd38058515655aa4a0b9aba59881");
("AHADIC++/Tools","trunk/SHERPA","31687M","2979133d7caafae6d7347c73f5a141bb");
(run){
% general settings
EVENTS 5M; ERROR 0.1;
EVENTS 10000; ERROR 0.1;
% tags and settings for scale definitions
FSF:=1.0; RSF:=1.0; QSF:=1.0;
SCALES STRICT_METS{FSF*MU_F2}{RSF*MU_R2}{QSF*MU_Q2};
% tags for process setup
LJET:=1,2,3; NJET:=2; QCUT:=30.;
NJET:=1; QCUT:=30.;
% tags and settings for ME generators
LOOPGEN0:=Internal;
LOOPGEN1:=MCFM;
ME_SIGNAL_GENERATOR Comix Amegic LOOPGEN0 LOOPGEN1;
EVENT_GENERATION_MODE Weighted;
COMIX_CLUSTER_CORE_CHECK 1;
......@@ -33,10 +31,5 @@
(processes){
Process 93 93 -> 25 93{NJET};
Order (*,0,1); CKKW sqr(QCUT/E_CMS);
NLO_QCD_Mode MC@NLO {LJET};
Loop_Generator LOOPGEN0 {1,2};
Loop_Generator LOOPGEN1 {3};
ME_Generator Amegic {LJET};
RS_ME_Generator Comix {LJET};
End process;
}(processes);
No preview for this file type
......@@ -7,6 +7,7 @@
% model parameters
ALPHAS(MZ) 0.1188;
ORDER_ALPHAS 2;
SHOWER_GENERATOR CSS
CSS_FS_PT2MIN = 1.0
%# CSS_NOEM = 1
......@@ -15,16 +16,18 @@
BEAM_2 -11; BEAM_ENERGY_2 45.6;
% process helpers
NJET:=2;
NJET:=1;
MASSIVE[4] 1;
MASSIVE[5] 1;
PARTICLE_CONTAINER 1098 C 4 -4;
PARTICLE_CONTAINER 1099 B 5 -5;
PDF_LIBRARY None;
YFS_MODE = 0
}(run)
(processes){
Process 11 -11 -> (93,1098,1099) (93,1098,1099) (93,1098,1099){NJET};
CKKW pow(10,-2.25);
CKKW 5.
Order (*,2);
End process;
}(processes)
......
This diff is collapsed.
This diff is collapsed.
......@@ -20,7 +20,8 @@ Shower_Handler::Shower_Handler
reader.SetInputPath(dir);
reader.SetInputFile(file);
m_name=reader.GetStringNormalisingNoneLikeValues("SHOWER_GENERATOR","Dire");
rpa->gen.SetVariable("JET_CRITERION",reader.Get<std::string>("JET_CRITERION",m_name));
rpa->gen.SetVariable("JET_CRITERION",
reader.Get<std::string>("JET_CRITERION",m_name));
p_shower = PDF::Shower_Getter::GetObject
(m_name,PDF::Shower_Key(model,p_isr,&reader,type));
if (p_shower==NULL && m_name!="None" &&
......
......@@ -76,11 +76,12 @@ bool Soft_Photon_Handler::AddRadiation(Particle_Vector& leps, Blob_Vector& blobs
void Soft_Photon_Handler::BoostDecayBlob(Blob * blob)
{
DEBUG_FUNC("");
msg_Debugging()<<*blob<<std::endl;
msg_Out()<<*blob<<std::endl;
const Vec4D& P((*blob)["p_original"]->Get<Vec4D>());
const Vec4D& Pt(blob->InParticle(0)->Momentum());
const Vec4D e(P-Pt);
msg_Debugging()<<"P-Pt="<<e<<" ["<<e.Mass()<<"]"<<std::endl;
msg_Out()<<"Before builidng tensors.\n";
const Lorentz_Ten2D lambda(MetricTensor()-2.*BuildTensor(e,e)/e.Abs2());
msg_Debugging()<<"\\Lambda="<<std::endl<<lambda<<std::endl;
for (size_t i(0);i<blob->NOutP();++i) {
......@@ -91,6 +92,7 @@ void Soft_Photon_Handler::BoostDecayBlob(Blob * blob)
blob->OutParticle(i)->SetMomentum(mom);
msg_Debugging()<<mom<<" ["<<mom.Mass()<<"]"<<std::endl;
}
msg_Out()<<"Before checkong onshell-ness.\n";
CheckOnshellness(blob);
if (msg_LevelIsDebugging()) {
for (size_t i(0);i<blob->NOutP();++i) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment