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.

Sign up for GitHub

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

Fix CDFZRAP #1068

Merged
merged 3 commits into from
Jan 27, 2021
+1,029 −0
Merged

Fix CDFZRAP #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6136a22
Fixed CDFZRAP measurement
Jan 24, 2021
5e25d51
Updated K-factors for CDFZRAP fixed data set
Jan 24, 2021
c4c15ea
Updated K-factor according to CS' prescription that combines (rather …
Jan 25, 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
71 changes: 71 additions & 0 deletions buildmaster/filters/CDF.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
/*
NOTE ADDED by ERN January 2021

The implementation of the CDF Z rapidity distributions has been updated to
reflect v4 in the arXiv. The difference w.r.t. the previous implementation
consists in th fact that the last two bins have been collapsed together;
central values and ucnertainties are also slightly different.
PLEASE note that the CDFZRAP data set is DEPRECATED in favour of the
CDFRAP_NEW data set
*/


/**
* ABULENCIA 07 PR D75,092006
Expand Down Expand Up @@ -434,6 +445,19 @@ void CDFR2KTFilter::ReadData()
*
*/

/* Note added by ERN on Janaury 2021

The data set has been updated to reflect the results published in
Phys. Lett. B692 232 (2010)
The last two rapidity bins have been collapsed together; central values and
uncertainties have been updated. The full breakdown of systematic
uncertainties has been produced with the error_propagator_g++.C provided
from the following link
https://www-cdf.fnal.gov/physics/ewk/2009/dszdy/dszdy_sys.htm
From NNPDF4.0 onwards, the use of the CDFZRAP data set is DEPRECATED in
favour of the CDFZRAP_NEW data set.
*/

void CDFZRAPFilter::ReadData()
{
// Opening files
Expand Down Expand Up @@ -482,6 +506,53 @@ void CDFZRAPFilter::ReadData()
f1.close();
}

void CDFZRAP_NEWFilter::ReadData()
{
// Opening files
fstream f1;

stringstream datafile("");
datafile << dataPath() << "rawdata/CDFZRAP/CDF-Zrapdist-2009_new.data";
f1.open(datafile.str().c_str(), ios::in);

if (f1.fail()) {
cerr << "Error opening data file " << datafile.str() << endl;
exit(-1);
}

// Starting filter
string line;
const double MZ2 = pow(MZ, 2.0);
const double s = 1960;
for (int i = 0; i < fNData; i++)
{
getline(f1,line);
istringstream lstream(line);

lstream >> fKin1[i]; //y
fKin2[i] = MZ2; //Mass Z squared
fKin3[i] = s; //sqrt(s)

lstream >> fData[i];
lstream >> fStat[i];

fSys[i][0].mult = 6.0; //luminosity
lstream >> fSys[i][0].add; //absolute value of 6% luminosity
fSys[i][0].type = MULT;
fSys[i][0].name = "CDFLUMI";

for (int isys = 1; isys < fNSys; isys++)
{
lstream >> fSys[i][isys].add; //systematics
fSys[i][isys].mult = fSys[i][isys].add*100/fData[i];
fSys[i][isys].type = MULT;
fSys[i][isys].name = "CORR";
}
}

f1.close();
}

/**
*
* Direct W rapidity asymmetry measurements at the Tevatron
Expand Down
8 changes: 8 additions & 0 deletions buildmaster/inc/CDF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ class CDFZRAPFilter: public CommonData
void ReadData();
};

class CDFZRAP_NEWFilter: public CommonData
{ public: CDFZRAP_NEWFilter():
CommonData("CDFZRAP_NEW") { ReadData(); }

private:
void ReadData();
};

class CDFR2KTFilter: public CommonData
{ public: CDFR2KTFilter():
CommonData("CDFR2KT_SF") { ReadData(); }
Expand Down
4 changes: 4 additions & 0 deletions buildmaster/meta/CDFZRAP_NEW.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ndata: 28
nsys: 11
setname: "CDFZRAP_NEW"
proctype: "EWK_RAP"
29 changes: 29 additions & 0 deletions buildmaster/rawdata/CDFZRAP/CDF-Zrapdist-2009_new.data
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
0.0500 69.4600 0.7300 -4.1676 -0.0220 -0.0302 0.0000 -0.2836 -0.0199 0.3220 0.2334 0.0000 0.0000 0.0000 4.1963
0.1500 71.0300 0.7400 -4.2618 -0.0210 -0.0391 0.0000 -0.2899 -0.0377 0.3169 0.2313 0.0000 0.0000 0.0000 4.2900
0.2500 71.1000 0.7400 -4.2660 -0.0187 -0.0655 0.0000 -0.2905 -0.0695 0.3048 0.2241 0.0000 0.0000 0.0000 4.2937
0.3500 70.0100 0.7200 -4.2006 -0.0172 -0.0905 0.0000 -0.2853 -0.1026 0.2880 0.2134 0.0000 0.0000 0.0000 4.2278
0.4500 67.9700 0.7000 -4.0782 -0.0138 -0.1078 0.0000 -0.2768 -0.1309 0.2677 0.2002 0.0000 0.0000 0.0000 4.1048
0.5500 68.2200 0.7000 -4.0932 -0.0131 -0.1381 0.0000 -0.2772 -0.1598 0.2569 0.1939 0.0000 0.0000 0.0000 4.1206
0.6500 66.5800 0.6900 -3.9948 -0.0111 -0.1498 0.0000 -0.2703 -0.1809 0.2391 0.1823 0.0000 0.0000 0.0000 4.0221
0.7500 66.8100 0.7000 -4.0086 -0.0084 -0.1697 0.0000 -0.2719 -0.2180 0.2283 0.1760 0.0000 0.0000 0.0000 4.0376
0.8500 65.0500 0.6900 -3.9030 -0.0056 -0.1876 0.0000 -0.2660 -0.2513 0.2110 0.1646 0.0000 0.0000 0.0000 3.9337
0.9500 64.7000 0.6900 -3.8820 -0.0036 -0.1819 0.0000 -0.2666 -0.2860 0.1987 0.1571 0.0000 0.0000 0.0000 3.9141
1.0500 62.7400 0.6700 -3.7644 -0.0015 -0.2115 -0.0035 -0.2510 -0.3001 0.1818 0.1458 0.0008 -0.0027 0.0005 3.7977
1.1500 62.0200 0.6600 -3.7212 -0.0006 -0.2131 -0.0297 -0.2451 -0.2972 0.1689 0.1377 0.0073 -0.0163 0.0044 3.7536
1.2500 58.8000 0.6500 -3.5280 0.0000 -0.2413 -0.0438 -0.2193 -0.2835 0.1500 0.1245 0.0261 -0.0559 0.0155 3.5605
1.3500 56.0200 0.6500 -3.3612 0.0000 -0.1995 -0.1032 -0.1797 -0.2541 0.1332 0.1128 0.0548 -0.0504 0.0323 3.3885
1.4500 53.3700 0.6300 -3.2022 0.0000 -0.1949 -0.1411 -0.1406 -0.2163 0.1176 0.1019 0.0867 -0.0490 0.0510 3.2273
1.5500 50.0700 0.6200 -3.0042 0.0000 -0.1817 -0.1489 -0.1068 -0.1787 0.1017 0.0905 0.1150 -0.0409 0.0682 3.0268
1.6500 46.5900 0.6100 -2.7954 0.0000 -0.1597 -0.1685 -0.0719 -0.1456 0.0865 0.0794 0.1380 -0.0462 0.0825 2.8171
1.7500 40.9700 0.5800 -2.4582 0.0000 -0.1122 -0.2115 -0.0402 -0.1047 0.0690 0.0656 0.1477 -0.0608 0.0895 2.4810
1.8500 37.0400 0.5600 -2.2224 0.0000 -0.0827 -0.2142 -0.0196 -0.0791 0.0560 0.0554 0.1540 -0.0980 0.0905 2.2464
1.9500 33.0200 0.5500 -1.9812 0.0000 -0.0529 -0.2074 -0.0071 -0.0632 0.0442 0.0460 0.1494 -0.1151 0.0891 2.0056
2.0500 27.6500 0.5200 -1.6590 0.0000 -0.0331 -0.1529 -0.0017 -0.0502 0.0322 0.0357 0.1303 -0.0955 0.0791 1.6775
2.1500 21.8400 0.4900 -1.3104 0.0000 -0.0184 -0.1638 -0.0003 -0.0392 0.0217 0.0259 0.1041 -0.0918 0.0621 1.3305
2.2500 18.3500 0.5000 -1.1010 0.0000 0.0000 -0.1360 0.0000 -0.0354 0.0150 0.0199 0.0877 -0.0937 0.0515 1.1188
2.3500 14.1300 0.4900 -0.8478 0.0000 0.0000 -0.1093 0.0000 -0.0293 0.0091 0.0139 0.0676 -0.0894 0.0410 0.8638
2.4500 8.8000 0.4500 -0.5280 0.0000 0.0000 -0.0569 0.0000 -0.0208 0.0042 0.0077 0.0421 -0.0634 0.0256 0.5376
2.5500 5.6800 0.4400 -0.3408 0.0000 0.0000 -0.0637 0.0000 -0.0150 0.0017 0.0044 0.0272 -0.0526 0.0167 0.3525
2.6500 2.9300 0.4100 -0.1758 0.0000 0.0000 -0.1449 0.0000 -0.0081 0.0004 0.0020 0.0140 -0.0333 0.0083 0.2310
2.8000 0.8700 0.2200 -0.0522 0.0000 0.0000 -0.1061 0.0000 -0.0040 -0.0001 0.0004 0.0042 -0.0133 0.0026 0.1192
2.9500 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
Loading