From 426e484e9ff7db98ad3eee9125d270d8ac2af015 Mon Sep 17 00:00:00 2001 From: Emanuele Nocera Date: Sun, 22 Mar 2020 08:44:19 +0100 Subject: [PATCH 1/6] Added CMS W charm data, 13 TeV --- db/apfelcomb.dat | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/db/apfelcomb.dat b/db/apfelcomb.dat index 2f59992..382decb 100644 --- a/db/apfelcomb.dat +++ b/db/apfelcomb.dat @@ -473,6 +473,8 @@ INSERT INTO app_subgrids VALUES(2047,'LHCB_WENU_8TEV_R_NUM','LHCB_W_ENU_8TEV_WP_ INSERT INTO app_subgrids VALUES(2048,'LHCB_WENU_8TEV_R_DEN','LHCB_W_ENU_8TEV_WM_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1',NULL); INSERT INTO app_subgrids VALUES(2049,'LHCB_WENU_8TEV_R_WP','LHCB_W_ENU_8TEV_WP_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1',NULL); INSERT INTO app_subgrids VALUES(2050,'LHCB_WENU_8TEV_R_WM','LHCB_W_ENU_8TEV_WM_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1',NULL); +INSERT INTO app_subgrids VALUES(2051,'CMS_WCHARM_13TEV_WPCB','CMS_WCHARM_13TEV_WPCB_leptrap.root',-1,0,1,0,'1 1 1 1 1','N:2'); +INSERT INTO app_subgrids VALUES(2052,'CMS_WCHARM_13TEV_WMC','CMS_WCHARM_13TEV_WMC_leptrap.root',-1,0,1,0,'1 1 1 1 1','N:2'); CREATE TABLE IF NOT EXISTS "dis_subgrids" ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -841,8 +843,10 @@ INSERT INTO grids VALUES(266,'LHCB_WENU_8TEV_R','LHCB_WENU_8TEV_R_NUM','LHCb W-> INSERT INTO grids VALUES(267,'LHCB_WENU_8TEV_R','LHCB_WENU_8TEV_R_DEN','LHCb W->e-nu production differential cross section',30,0,'APP'); INSERT INTO grids VALUES(268,'LHCB_WENU_8TEV_A','LHCB_WENU_8TEV_R_WP','LHCb W->e+nu production differential cross section',30,0,'APP'); INSERT INTO grids VALUES(269,'LHCB_WENU_8TEV_A','LHCB_WENU_8TEV_R_WM','LHCb W->e-nu production differential cross section',30,0,'APP'); -INSERT INTO grids VALUES(270,'CHORUSNBPb','CHORUSNBPb','CHORUS NB Pb',50,0,'DIS'); -INSERT INTO grids VALUES(271,'CHORUSNUPb','CHORUSNUPb','CHORUS NU Pb',50,0,'DIS'); +INSERT INTO grids VALUES(270,'CMS_WCHARM_DIFF_UNNORM_13TEV','CMS_WCHARM_13TEV_WPCB','CMS->W+c~ production differential cross section',20,0,'APP'); +INSERT INTO grids VALUES(271,'CMS_WCHARM_DIFF_UNNORM_13TEV','CMS_WCHARM_13TEV_WMC','CMS->W-c production differential cross section',20,0,'APP'); +INSERT INTO grids VALUES(272,'CHORUSNBPb','CHORUSNBPb','CHORUS NB Pb',50,0,'DIS'); +INSERT INTO grids VALUES(273,'CHORUSNUPb','CHORUSNUPb','CHORUS NU Pb',50,0,'DIS'); DELETE FROM sqlite_sequence; INSERT INTO sqlite_sequence VALUES('dis_subgrids',53); From ba9dc52a3c9ba301f9eb0f80586a39efba388ced Mon Sep 17 00:00:00 2001 From: Emanuele Nocera Date: Sun, 22 Mar 2020 09:43:45 +0100 Subject: [PATCH 2/6] Added compound filel for CMS W charm 13 TeV --- compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat diff --git a/compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat b/compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat new file mode 100644 index 0000000..2a9cc64 --- /dev/null +++ b/compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat @@ -0,0 +1,4 @@ +# COMPOUND FK +FK: FK_CMS_WCHARM_13TEV_WPCB.dat +FK: FK_CMS_WCHARM_13TEV_WC.dat +OP: ADD From eb707ad42d077b24974d11e70364222af0fe5084 Mon Sep 17 00:00:00 2001 From: Emanuele Nocera Date: Sun, 22 Mar 2020 09:52:56 +0100 Subject: [PATCH 3/6] Corrected typo in compound file --- compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat b/compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat index 2a9cc64..f4ffb39 100644 --- a/compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat +++ b/compound/FK_CMS_WCHARM_DIFF_UNNORM_13TEV-COMPOUND.dat @@ -1,4 +1,4 @@ # COMPOUND FK FK: FK_CMS_WCHARM_13TEV_WPCB.dat -FK: FK_CMS_WCHARM_13TEV_WC.dat +FK: FK_CMS_WCHARM_13TEV_WMC.dat OP: ADD From 260274321a535a1cd2882872e2fe1533b2931f62 Mon Sep 17 00:00:00 2001 From: Emanuele Nocera Date: Thu, 2 Apr 2020 10:59:19 +0200 Subject: [PATCH 4/6] Added ATLAS 7 TeV W+c production --- db/apfelcomb.dat | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/db/apfelcomb.dat b/db/apfelcomb.dat index 382decb..a6ba603 100644 --- a/db/apfelcomb.dat +++ b/db/apfelcomb.dat @@ -473,8 +473,10 @@ INSERT INTO app_subgrids VALUES(2047,'LHCB_WENU_8TEV_R_NUM','LHCB_W_ENU_8TEV_WP_ INSERT INTO app_subgrids VALUES(2048,'LHCB_WENU_8TEV_R_DEN','LHCB_W_ENU_8TEV_WM_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1',NULL); INSERT INTO app_subgrids VALUES(2049,'LHCB_WENU_8TEV_R_WP','LHCB_W_ENU_8TEV_WP_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1',NULL); INSERT INTO app_subgrids VALUES(2050,'LHCB_WENU_8TEV_R_WM','LHCB_W_ENU_8TEV_WM_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1',NULL); -INSERT INTO app_subgrids VALUES(2051,'CMS_WCHARM_13TEV_WPCB','CMS_WCHARM_13TEV_WPCB_leptrap.root',-1,0,1,0,'1 1 1 1 1','N:2'); -INSERT INTO app_subgrids VALUES(2052,'CMS_WCHARM_13TEV_WMC','CMS_WCHARM_13TEV_WMC_leptrap.root',-1,0,1,0,'1 1 1 1 1','N:2'); +INSERT INTO app_subgrids VALUES(2051,'CMS_WCHARM_13TEV_WPCB','CMS_WCHARM_13TEV_WPCB_leptrap.root',-1,0,1,0,'1 1 1 1 1',NULL); +INSERT INTO app_subgrids VALUES(2052,'CMS_WCHARM_13TEV_WMC','CMS_WCHARM_13TEV_WMC_leptrap.root',-1,0,1,0,'1 1 1 1 1',NULL); +INSERT INTO app_subgrids VALUES(2053,'ATLAS_WCHARM_7TEV_WPCB','ATLAS_WCHARM_7TEV_WPCB_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1 1 1 1',NULL); +INSERT INTO app_subgrids VALUES(2054,'ATLAS_WCHARM_7TEV_WMC','ATLAS_WCHARM_7TEV_WMC_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1 1 1 1',NULL); CREATE TABLE IF NOT EXISTS "dis_subgrids" ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -845,11 +847,13 @@ INSERT INTO grids VALUES(268,'LHCB_WENU_8TEV_A','LHCB_WENU_8TEV_R_WP','LHCb W->e INSERT INTO grids VALUES(269,'LHCB_WENU_8TEV_A','LHCB_WENU_8TEV_R_WM','LHCb W->e-nu production differential cross section',30,0,'APP'); INSERT INTO grids VALUES(270,'CMS_WCHARM_DIFF_UNNORM_13TEV','CMS_WCHARM_13TEV_WPCB','CMS->W+c~ production differential cross section',20,0,'APP'); INSERT INTO grids VALUES(271,'CMS_WCHARM_DIFF_UNNORM_13TEV','CMS_WCHARM_13TEV_WMC','CMS->W-c production differential cross section',20,0,'APP'); -INSERT INTO grids VALUES(272,'CHORUSNBPb','CHORUSNBPb','CHORUS NB Pb',50,0,'DIS'); -INSERT INTO grids VALUES(273,'CHORUSNUPb','CHORUSNUPb','CHORUS NU Pb',50,0,'DIS'); +INSERT INTO grids VALUES(272,'ATLAS_WCHARM_DIFF_UNNORM_7TEV','ATLAS_WCHARM_7TEV_WPCB','ATLAS->W+c~ production differential cross section 7 TeV',20,0,'APP'); +INSERT INTO grids VALUES(273,'ATLAS_WCHARM_DIFF_UNNORM_7TEV','ATLAS_WCHARM_7TEV_WMC','ATLAS->W-c production differential cross section 7 TeV',20,0,'APP'); +INSERT INTO grids VALUES(274,'CHORUSNBPb','CHORUSNBPb','CHORUS NB Pb',50,0,'DIS'); +INSERT INTO grids VALUES(275,'CHORUSNUPb','CHORUSNUPb','CHORUS NU Pb',50,0,'DIS'); DELETE FROM sqlite_sequence; INSERT INTO sqlite_sequence VALUES('dis_subgrids',53); INSERT INTO sqlite_sequence VALUES('dyp_subgrids',23); -INSERT INTO sqlite_sequence VALUES('grids',265); +INSERT INTO sqlite_sequence VALUES('grids',275); COMMIT; From 849639fdd130ed4b3e311bf2d72271672ae9c138 Mon Sep 17 00:00:00 2001 From: Emanuele Nocera Date: Thu, 2 Apr 2020 11:38:18 +0200 Subject: [PATCH 5/6] Corrected bug in the name of the ATLAS W+c data sets --- db/apfelcomb.dat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/apfelcomb.dat b/db/apfelcomb.dat index a6ba603..759f7b8 100644 --- a/db/apfelcomb.dat +++ b/db/apfelcomb.dat @@ -847,8 +847,8 @@ INSERT INTO grids VALUES(268,'LHCB_WENU_8TEV_A','LHCB_WENU_8TEV_R_WP','LHCb W->e INSERT INTO grids VALUES(269,'LHCB_WENU_8TEV_A','LHCB_WENU_8TEV_R_WM','LHCb W->e-nu production differential cross section',30,0,'APP'); INSERT INTO grids VALUES(270,'CMS_WCHARM_DIFF_UNNORM_13TEV','CMS_WCHARM_13TEV_WPCB','CMS->W+c~ production differential cross section',20,0,'APP'); INSERT INTO grids VALUES(271,'CMS_WCHARM_DIFF_UNNORM_13TEV','CMS_WCHARM_13TEV_WMC','CMS->W-c production differential cross section',20,0,'APP'); -INSERT INTO grids VALUES(272,'ATLAS_WCHARM_DIFF_UNNORM_7TEV','ATLAS_WCHARM_7TEV_WPCB','ATLAS->W+c~ production differential cross section 7 TeV',20,0,'APP'); -INSERT INTO grids VALUES(273,'ATLAS_WCHARM_DIFF_UNNORM_7TEV','ATLAS_WCHARM_7TEV_WMC','ATLAS->W-c production differential cross section 7 TeV',20,0,'APP'); +INSERT INTO grids VALUES(272,'ATLAS_WPCHARM_DIFF_UNNORM_7TEV','ATLAS_WCHARM_7TEV_WPCB','ATLAS->W+c~ production differential cross section 7 TeV',20,0,'APP'); +INSERT INTO grids VALUES(273,'ATLAS_WMCHARM_DIFF_UNNORM_7TEV','ATLAS_WCHARM_7TEV_WMC','ATLAS->W-c production differential cross section 7 TeV',20,0,'APP'); INSERT INTO grids VALUES(274,'CHORUSNBPb','CHORUSNBPb','CHORUS NB Pb',50,0,'DIS'); INSERT INTO grids VALUES(275,'CHORUSNUPb','CHORUSNUPb','CHORUS NU Pb',50,0,'DIS'); From dad8c60ffc6753861cb72a0789c500223d419b30 Mon Sep 17 00:00:00 2001 From: Emanuele Nocera Date: Fri, 3 Apr 2020 09:35:57 +0200 Subject: [PATCH 6/6] Added generation of CMS and ATLAS W+charm FK tables --- db/apfelcomb.dat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/apfelcomb.dat b/db/apfelcomb.dat index 759f7b8..c62c3a5 100644 --- a/db/apfelcomb.dat +++ b/db/apfelcomb.dat @@ -475,8 +475,8 @@ INSERT INTO app_subgrids VALUES(2049,'LHCB_WENU_8TEV_R_WP','LHCB_W_ENU_8TEV_WP_l INSERT INTO app_subgrids VALUES(2050,'LHCB_WENU_8TEV_R_WM','LHCB_W_ENU_8TEV_WM_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1',NULL); INSERT INTO app_subgrids VALUES(2051,'CMS_WCHARM_13TEV_WPCB','CMS_WCHARM_13TEV_WPCB_leptrap.root',-1,0,1,0,'1 1 1 1 1',NULL); INSERT INTO app_subgrids VALUES(2052,'CMS_WCHARM_13TEV_WMC','CMS_WCHARM_13TEV_WMC_leptrap.root',-1,0,1,0,'1 1 1 1 1',NULL); -INSERT INTO app_subgrids VALUES(2053,'ATLAS_WCHARM_7TEV_WPCB','ATLAS_WCHARM_7TEV_WPCB_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1 1 1 1',NULL); -INSERT INTO app_subgrids VALUES(2054,'ATLAS_WCHARM_7TEV_WMC','ATLAS_WCHARM_7TEV_WMC_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1 1 1 1',NULL); +INSERT INTO app_subgrids VALUES(2053,'ATLAS_WCHARM_WP_DIFF_7TEV','ATLAS_WCHARM_7TEV_WPCB_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1 1 1 1',NULL); +INSERT INTO app_subgrids VALUES(2054,'ATLAS_WCHARM_WM_DIFF_7TEV','ATLAS_WCHARM_7TEV_WMC_leptrap.root',-1,0,1,0,'1 1 1 1 1 1 1 1 1 1 1',NULL); CREATE TABLE IF NOT EXISTS "dis_subgrids" ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -847,8 +847,8 @@ INSERT INTO grids VALUES(268,'LHCB_WENU_8TEV_A','LHCB_WENU_8TEV_R_WP','LHCb W->e INSERT INTO grids VALUES(269,'LHCB_WENU_8TEV_A','LHCB_WENU_8TEV_R_WM','LHCb W->e-nu production differential cross section',30,0,'APP'); INSERT INTO grids VALUES(270,'CMS_WCHARM_DIFF_UNNORM_13TEV','CMS_WCHARM_13TEV_WPCB','CMS->W+c~ production differential cross section',20,0,'APP'); INSERT INTO grids VALUES(271,'CMS_WCHARM_DIFF_UNNORM_13TEV','CMS_WCHARM_13TEV_WMC','CMS->W-c production differential cross section',20,0,'APP'); -INSERT INTO grids VALUES(272,'ATLAS_WPCHARM_DIFF_UNNORM_7TEV','ATLAS_WCHARM_7TEV_WPCB','ATLAS->W+c~ production differential cross section 7 TeV',20,0,'APP'); -INSERT INTO grids VALUES(273,'ATLAS_WMCHARM_DIFF_UNNORM_7TEV','ATLAS_WCHARM_7TEV_WMC','ATLAS->W-c production differential cross section 7 TeV',20,0,'APP'); +INSERT INTO grids VALUES(272,'ATLAS_WCHARM_WP_DIFF_7TEV','ATLAS_WCHARM_WP_DIFF_7TEV','ATLAS->W+c~ production differential cross section 7 TeV',20,0,'APP'); +INSERT INTO grids VALUES(273,'ATLAS_WCHARM_WM_DIFF_7TEV','ATLAS_WCHARM_WM_DIFF_7TEV','ATLAS->W-c production differential cross section 7 TeV',20,0,'APP'); INSERT INTO grids VALUES(274,'CHORUSNBPb','CHORUSNBPb','CHORUS NB Pb',50,0,'DIS'); INSERT INTO grids VALUES(275,'CHORUSNUPb','CHORUSNUPb','CHORUS NU Pb',50,0,'DIS');