Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
da7df0f
[nobm] add nobm_gg_tt to check if the builds are ok - indeed this is …
valassi Jun 13, 2023
4c53ea2
[nobm] add nobm_gg_tt.sa to the repo - this is affected by #696
valassi Jun 13, 2023
8e6f925
[nobm] add nobm_pp_ttW.mad to the repo - this is affected by #696
valassi Jul 21, 2023
10b099e
[nobm] distinguish between loop_sm-no_b_mass and sm-no_b_mass for tt,…
valassi Jun 13, 2023
d9fb94d
[nobm] in nobm_gg_tt.sa, rename all loop_sm_no_b_mass files as sm_no_…
valassi Jun 13, 2023
f045418
[nobm] regenerate nobm_gg_tt.sa after moving to sm-no_b_mass (without…
valassi Jun 13, 2023
c6ca0d7
[nobm] in nobm_pp_ttW.mad, rename all loop_sm_no_b_mass files as sm_n…
valassi Jul 21, 2023
bcf8cf4
[nobm] regenerate nobm_pp_ttW.mad after moving to sm-no_b_mass (witho…
valassi Jul 21, 2023
2d51eb0
[nobm] add the reference file for test Sigma_sm_no_b_mass_gd_ttxwmu.t…
valassi Jul 14, 2023
5a358fe
[nobm] regenerate nobm_pp_ttW.mad after adding the test
valassi Jul 21, 2023
b1ad04e
Merge branch 'fpe' into nobm
valassi Jul 21, 2023
840a81a
[nobm/fpe] regenerate nobm_pp_ttW.mad after merging branch fpe with t…
valassi Jul 21, 2023
d4ddce6
[nobm] improve lauX.sh script, add support for a generic process #683
valassi Jun 13, 2023
458d4c2
Merge branch 'fpe' into nobm
valassi Jul 21, 2023
6e6391b
[nobm/fpe] regenerate nobm_pp_ttW.mad after merging the latest branch…
valassi Jul 21, 2023
e6962e4
[nobm] remove nobm_gg_tt.sa from the repo, concentrate instead on nob…
valassi Jul 21, 2023
4461595
Merge remote-tracking branch 'upstream/master' into nobm
valassi Jul 21, 2023
e915121
[nobm] in nobm_pp_ttW.mad/SubProcesses/P1_gd_ttxwmu, enable FPEs in c…
valassi Jul 21, 2023
7c0055b
[nobm] in nobm_pp_ttW.mad, add debug printouts in HelAmps_sm_no_b_mas…
valassi Jul 21, 2023
9a1e825
[nobm] revert the last two changes in nobm_pp_ttW.mad, which have not…
valassi Oct 29, 2023
eab5b82
[nobm] regenerate nobm_pp_ttW.mad and check that all is ok, no change…
valassi Oct 29, 2023
6c283b5
[nobm] in nobm_pp_ttW.mad/SubProcesses/P1_gd_ttxwmu, enable FPEs in c…
valassi Oct 29, 2023
92434d9
[oct23av/nobm] in CODEGEN check_sa.cc, enable FPEs in check_sa.cc to …
valassi Oct 29, 2023
0481e73
[nobm] regenerate nobm_pp_ttW after enabling FPE in CODEGEN check_sa.…
valassi Oct 29, 2023
9e8d9bf
Merge remote-tracking branch 'upstream/master' into nobm
valassi Oct 29, 2023
3b8cc30
Merge branch 'oct23av' into nobm
valassi Oct 29, 2023
dee1912
[nobm] regenerate nobm_pp_ttW.mad after merging upstream/master and m…
valassi Oct 29, 2023
ff0ccba
[nobm] in nobm_pp_ttW.mad, add back debug printouts in HelAmps_sm_no_…
valassi Jul 21, 2023
9058889
[nobm] in nobm_pp_ttW.mad, remove again the debug printouts in HelAmp…
valassi Oct 30, 2023
d870e34
[nobm] further improve the lauX.sh script
valassi Oct 30, 2023
27a56b9
[nobm] add logs for tlau nobmppttW_CPP tests, which now succeed (the …
valassi Oct 30, 2023
c85f6f3
Merge remote-tracking branch 'upstream/master' into nobm
valassi Nov 8, 2023
3da0a58
[nobm] regenerate nobm_pp_ttW.mad after merging the latest upstream/m…
valassi Nov 8, 2023
5537d79
[nobm/actions] in CODEGEN, update the only current ref log for nobm_p…
valassi Nov 8, 2023
b59b387
[nobm/actions] in CODEGEN, add many missing ref files from nobm_pp_ttW
valassi Nov 8, 2023
8916967
[nobm] regenerate nobm_pp_ttW.mad including the latest ref files
valassi Nov 8, 2023
df925ab
Merge remote-tracking branch 'upstream/master' into nobm
valassi Nov 15, 2023
c321fcb
[nobm] regenerate nobm_pp_ttW.mad after merging the latest upstream/m…
valassi Nov 15, 2023
aba2501
[nobm] in nobm_pp_ttW.mad P1_gd_ttxwmu/CPPProcess.cc, skip evt-by-evt…
valassi Nov 24, 2023
6ac6cf9
[nobm] backport to codegen from nobm_pp_ttW.mad the bug fix for FPE #…
valassi Nov 24, 2023
be5822d
[nobm] regenerate nobm_pp_ttW.mad, ok no change in P1_gd_ttxwmu
valassi Nov 24, 2023
bfda86b
[nobm] regenerate ggttg.mad with fix for FPE #783
valassi Nov 24, 2023
13efd8d
[nobm] regenerate all processes with the fix for FPE #783
valassi Nov 24, 2023
837d272
[nobm] rerun 78 tput tests, now all ok after fixing #783 (there are n…
valassi Nov 24, 2023
597f928
[nobm] rerun 18 tmad tests, all ok
valassi Nov 25, 2023
21eedc0
[dyj] in codegen, add Drell Yan nobm_pp_eejjjj
valassi Nov 24, 2023
9bd1a8b
[dyj] in CODEGEN/generateAndCompare.sh, add minor fix to avoid silent…
valassi Nov 24, 2023
84eb007
[dyj] in CODEGEN/generateAndCompare.sh, add code generation timing in…
valassi Nov 24, 2023
d8a5d0b
[dyj] in CODEGEN/generateAndCompare.sh, improve timing for code gener…
valassi Nov 25, 2023
7e6dfe0
[dyj] in codegen, add Drell Yan nobm_pp_eejjj
valassi Nov 25, 2023
e378707
[dyj] in codegen, add Drell Yan gg_eegguu
valassi Nov 25, 2023
b8ef88b
[ggtt4g] add "g g > t t~ g g g g" to codegen and formatting scripts
valassi Feb 24, 2023
b4aa25b
[ggtt4g] in tput/teeThroughputX.sh, use log_*_sa for -sa tests of .sa…
valassi Feb 25, 2023
ee0c0a1
[nobm] regenerate all processes, to be sure all is ok after a few che…
valassi Nov 25, 2023
c54d62d
[nobm] also regenerate nobm_pp_ttW.mad, no change
valassi Nov 25, 2023
b81b572
[nobm] in .github/workflows, add nobm_pp_ttW to the testsuite CI
valassi Nov 25, 2023
e84a7b8
[nobm] ** COMPLETE NOBM ** remove nobm_pp_ttW.mad from the repo for s…
valassi Nov 25, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/testsuite_allprocesses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false # important to see all results even if one fails (fail-fast is true by default)
matrix:
# FIXME? Can the list of supported processes be specified only once in oneprocess.yml or allprocesses.yml?
process: [ee_mumu, gg_tt, gg_ttg, gg_ttgg, gg_ttggg, gg_tt01g, gq_ttq, pp_tt012j]
process: [ee_mumu, gg_tt, gg_ttg, gg_ttgg, gg_ttggg, gg_tt01g, gq_ttq, pp_tt012j, nobm_pp_ttW]
suffix: [mad, sa]
uses: ./.github/workflows/testsuite_oneprocess.yml
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testsuite_oneprocess.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
###type: string
type: choice
# FIXME? Can the list of supported processes be specified only once in oneprocess.yml or allprocesses.yml?
options: [gg_tt.mad, gg_ttg.mad, gg_ttgg.mad, gg_ttggg.mad, ee_mumu.mad]
options: [gg_tt.mad, gg_ttg.mad, gg_ttgg.mad, gg_ttggg.mad, ee_mumu.mad, nobm_pp_ttW.mad]

#----------------------------------------------------------------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,26 @@
}
#ifdef MGONGPU_SUPPORTS_MULTICHANNEL
// Event-by-event random choice of color #402
const int channelIdC = channelId - 1; // coloramps.h uses the C array indexing starting at 0
fptype targetamp[ncolor] = { 0 };
for( int icolC = 0; icolC < ncolor; icolC++ )
if( channelId != 0 ) // no event-by-event choice of color if channelId == 0 (fix FPE #783)
{
if( icolC == 0 )
targetamp[icolC] = 0;
else
targetamp[icolC] = targetamp[icolC - 1];
if( mgOnGpu::icolamp[channelIdC][icolC] ) targetamp[icolC] += jamp2_sv[icolC];
}
//printf( "sigmaKin: ievt=%%4d rndcol=%%f\n", ievt, allrndcol[ievt] );
for( int icolC = 0; icolC < ncolor; icolC++ )
{
if( allrndcol[ievt] < ( targetamp[icolC] / targetamp[ncolor - 1] ) )
const unsigned int channelIdC = channelId - 1; // coloramps.h uses the C array indexing starting at 0
fptype targetamp[ncolor] = { 0 };
for( int icolC = 0; icolC < ncolor; icolC++ )
{
allselcol[ievt] = icolC + 1; // NB Fortran [1,ncolor], cudacpp [0,ncolor-1]
break;
if( icolC == 0 )
targetamp[icolC] = 0;
else
targetamp[icolC] = targetamp[icolC - 1];
if( mgOnGpu::icolamp[channelIdC][icolC] ) targetamp[icolC] += jamp2_sv[icolC];
}
//printf( "sigmaKin: ievt=%%4d rndcol=%%f\n", ievt, allrndcol[ievt] );
for( int icolC = 0; icolC < ncolor; icolC++ )
{
if( allrndcol[ievt] < ( targetamp[icolC] / targetamp[ncolor - 1] ) )
{
allselcol[ievt] = icolC + 1; // NB Fortran [1,ncolor], cudacpp [0,ncolor-1]
break;
}
}
}
#endif
Expand Down Expand Up @@ -178,57 +181,60 @@
#endif
}
#ifdef MGONGPU_SUPPORTS_MULTICHANNEL // multichannel enabled (random color choice)
const int channelIdC = channelId - 1; // coloramps.h uses the C array indexing starting at 0
// Event-by-event random choice of color #402
fptype_sv targetamp[ncolor] = { 0 };
for( int icolC = 0; icolC < ncolor; icolC++ )
if( channelId != 0 ) // no event-by-event choice of color if channelId == 0 (fix FPE #783)
{
if( icolC == 0 )
targetamp[icolC] = fptype_sv{ 0 };
else
targetamp[icolC] = targetamp[icolC - 1];
if( mgOnGpu::icolamp[channelIdC][icolC] ) targetamp[icolC] += jamp2_sv[icolC];
}
const unsigned int channelIdC = channelId - 1; // coloramps.h uses the C array indexing starting at 0
fptype_sv targetamp[ncolor] = { 0 };
for( int icolC = 0; icolC < ncolor; icolC++ )
{
if( icolC == 0 )
targetamp[icolC] = fptype_sv{ 0 };
else
targetamp[icolC] = targetamp[icolC - 1];
if( mgOnGpu::icolamp[channelIdC][icolC] ) targetamp[icolC] += jamp2_sv[icolC];
}
#if defined MGONGPU_CPPSIMD and defined MGONGPU_FPTYPE_DOUBLE and defined MGONGPU_FPTYPE2_FLOAT
fptype_sv targetamp2[ncolor] = { 0 };
for( int icolC = 0; icolC < ncolor; icolC++ )
{
if( icolC == 0 )
targetamp2[icolC] = fptype_sv{ 0 };
else
targetamp2[icolC] = targetamp2[icolC - 1];
if( mgOnGpu::icolamp[channelIdC][icolC] ) targetamp2[icolC] += jamp2_sv[ncolor + icolC];
}
#endif
for( int ieppV = 0; ieppV < neppV; ++ieppV )
{
const int ievt = ievt00 + ieppV;
//printf( "sigmaKin: ievt=%%4d rndcol=%%f\n", ievt, allrndcol[ievt] );
fptype_sv targetamp2[ncolor] = { 0 };
for( int icolC = 0; icolC < ncolor; icolC++ )
{
if( icolC == 0 )
targetamp2[icolC] = fptype_sv{ 0 };
else
targetamp2[icolC] = targetamp2[icolC - 1];
if( mgOnGpu::icolamp[channelIdC][icolC] ) targetamp2[icolC] += jamp2_sv[ncolor + icolC];
}
#endif
for( int ieppV = 0; ieppV < neppV; ++ieppV )
{
const int ievt = ievt00 + ieppV;
//printf( "sigmaKin: ievt=%%4d rndcol=%%f\n", ievt, allrndcol[ievt] );
for( int icolC = 0; icolC < ncolor; icolC++ )
{
#if defined MGONGPU_CPPSIMD
const bool okcol = allrndcol[ievt] < ( targetamp[icolC][ieppV] / targetamp[ncolor - 1][ieppV] );
const bool okcol = allrndcol[ievt] < ( targetamp[icolC][ieppV] / targetamp[ncolor - 1][ieppV] );
#else
const bool okcol = allrndcol[ievt] < ( targetamp[icolC] / targetamp[ncolor - 1] );
const bool okcol = allrndcol[ievt] < ( targetamp[icolC] / targetamp[ncolor - 1] );
#endif
if( okcol )
{
allselcol[ievt] = icolC + 1; // NB Fortran [1,ncolor], cudacpp [0,ncolor-1]
break;
if( okcol )
{
allselcol[ievt] = icolC + 1; // NB Fortran [1,ncolor], cudacpp [0,ncolor-1]
break;
}
}
}
#if defined MGONGPU_CPPSIMD and defined MGONGPU_FPTYPE_DOUBLE and defined MGONGPU_FPTYPE2_FLOAT
const int ievt2 = ievt00 + ieppV + neppV;
//printf( "sigmaKin: ievt=%%4d rndcol=%%f\n", ievt2, allrndcol[ievt2] );
for( int icolC = 0; icolC < ncolor; icolC++ )
{
if( allrndcol[ievt2] < ( targetamp2[icolC][ieppV] / targetamp2[ncolor - 1][ieppV] ) )
const int ievt2 = ievt00 + ieppV + neppV;
//printf( "sigmaKin: ievt=%%4d rndcol=%%f\n", ievt2, allrndcol[ievt2] );
for( int icolC = 0; icolC < ncolor; icolC++ )
{
allselcol[ievt2] = icolC + 1; // NB Fortran [1,ncolor], cudacpp [0,ncolor-1]
break;
if( allrndcol[ievt2] < ( targetamp2[icolC][ieppV] / targetamp2[ncolor - 1][ieppV] ) )
{
allselcol[ievt2] = icolC + 1; // NB Fortran [1,ncolor], cudacpp [0,ncolor-1]
break;
}
}
}
#endif
}
}
#endif // multichannel enabled (random color choice)
}
Expand Down
Loading