oldhepdata: remove None values for data_license

* Closes #32.

hepdata_converter/parsers/__init__.py

@@ -48,13 +48,6 @@ def __init__(self, index=None, data_file=None, table_name=None, metadata=None, d
                 {'name': 'cmenergies', 'values': []},
             ],
             'data_file': data_file or 'data%s.yaml' % index,
-            # it seems it's required
-            # TODO - is it really required? should sensible defaults be provided?
-            'data_license': {
-                'name': None,
-                'url': None,
-                'description': None # (optional)
-            },
             'additional_resources': [
                 # Below in the comments are listed allowed keys / values for additional_resources
                 #

hepdata_converter/testsuite/test_convert.py

@@ -41,7 +41,6 @@ def setUp(self):
             "---\n"
             "additional_resources: []\n"
             "data_file: data1.yaml\n"
-            "data_license: {description: null, name: null, url: null}\n"
             "description: 'The measured fiducial cross sections.  The first systematic uncertainty\n"
             "  is the combined systematic uncertainty excluding luminosity, the second is the luminosity.'\n"
             "keywords:\n"

hepdata_converter/testsuite/testdata/csv/full/Table1.csv

@@ -1,7 +1,6 @@
 #: name: Table 1
 #: description: The measured fiducial cross sections.  The first systematic uncertainty is the combined systematic uncertainty excluding luminosity, the second is the luminosity.
 #: data_file: data1.yaml
-#: data_license:   
 #: keyword reactions: P P --> Z0 Z0 X
 #: keyword observables: SIG
 #: keyword phrases: 

hepdata_converter/testsuite/testdata/csv/full/Table2.csv

@@ -1,7 +1,6 @@
 #: name: Table 2
 #: description: The measured total cross sections.  The first systematic uncertainty is the combined systematic uncertainty excluding luminosity, the second is the luminosity.
 #: data_file: data2.yaml
-#: data_license:   
 #: keyword reactions: P P --> Z0 Z0 X
 #: keyword observables: SIG
 #: keyword phrases: 

hepdata_converter/testsuite/testdata/csv/full/Table3.csv

@@ -1,7 +1,6 @@
 #: name: Table 3
 #: description: Normalized ZZ fiducial cross section (multiplied by 10^6 for readability) in bins of the leading reconstructed dilepton pT for the 4 lepton channel.  The first systematic uncertainty is detector systematics, the second is background systematic uncertainties.
 #: data_file: data3.yaml
-#: data_license:   
 #: keyword reactions: P P --> Z0 Z0 X
 #: keyword observables: DSIG/DPT
 #: keyword phrases: 

hepdata_converter/testsuite/testdata/csv/full/Table4.csv

@@ -1,7 +1,6 @@
 #: name: Table 4
 #: description: Normalized ZZ fiducial cross section (multiplied by 10^6 for readability) in bins of the dilepton pT for the 2l2nu channel.  The first systematic uncertainty is detector systematics, the second is background systematic uncertainties.
 #: data_file: data4.yaml
-#: data_license:   
 #: keyword reactions: P P --> Z0 Z0 X
 #: keyword observables: DSIG/DPT
 #: keyword phrases: 

hepdata_converter/testsuite/testdata/csv/full/Table5.csv

@@ -2,7 +2,6 @@
 #: description: Normalized ZZ fiducial cross section (multiplied by 10^6 for readability) in bins of deltaPhi between the two leptons of the leading dileptons for the 4l channel.  The first systematic uncertainty is detector systematics, the second is background systematic uncertainties.
 UPDATE (30 APR 2014): extra significant digit added for first bin.
 #: data_file: data5.yaml
-#: data_license:   
 #: keyword reactions: P P --> Z0 Z0 X
 #: keyword observables: DSIG/DPHI
 #: keyword phrases: 

hepdata_converter/testsuite/testdata/csv/full/Table6.csv

@@ -1,7 +1,6 @@
 #: name: Table 6
 #: description: Normalized ZZ fiducial cross section (multiplied by 10^6 for readability) in bins of deltaPhi between the two leptons for the 2l2nu channel.  The first systematic uncertainty is detector systematics, the second is background systematic uncertainties.
 #: data_file: data6.yaml
-#: data_license:   
 #: keyword reactions: P P --> Z0 Z0 X
 #: keyword observables: DSIG/DPHI
 #: keyword phrases: 

hepdata_converter/testsuite/testdata/csv/full/Table7.csv

@@ -1,7 +1,6 @@
 #: name: Table 7
 #: description: Normalized ZZ fiducial cross section (multiplied by 10^6 for readability) in bins of the mass of the ZZ system for the 4l channel.  The first systematic uncertainty is detector systematics, the second is background systematic uncertainties.
 #: data_file: data7.yaml
-#: data_license:   
 #: keyword reactions: P P --> Z0 Z0 X
 #: keyword observables: DSIG/DM
 #: keyword phrases: 

hepdata_converter/testsuite/testdata/csv/full/Table8.csv

@@ -1,7 +1,6 @@
 #: name: Table 8
 #: description: Normalized ZZ fiducial cross section (multiplied by 10^6 for readability) in bins of the transverse mass of the ZZ system for the 2l2nu channel.  The first systematic uncertainty is detector systematics, the second is background systematic uncertainties.
 #: data_file: data8.yaml
-#: data_license:   
 #: keyword reactions: P P --> Z0 Z0 X
 #: keyword observables: DSIG/DM
 #: keyword phrases: 

hepdata_converter/testsuite/testdata/oldhepdata/1396331-yaml/submission.yaml

@@ -20,7 +20,6 @@ record_ids:
 ---
 additional_resources: []
 data_file: data1.yaml
-data_license: {description: null, name: null, url: null}
 description: Differential production cross-sections in for prompt $D^{0} + \bar{D}^{0}$
   mesons in bins of $(p_{\mathrm{T}}, y)$. The first uncertainty is statistical, and
   the second is the total systematic.
@@ -38,7 +37,6 @@ name: Table 1
 ---
 additional_resources: []
 data_file: data2.yaml
-data_license: {description: null, name: null, url: null}
 description: Differential production cross-sections in for prompt $D^{+} + D^{-}$
   mesons in bins of $(p_{\mathrm{T}}, y)$. The first uncertainty is statistical, and
   the second is the total systematic.
@@ -56,7 +54,6 @@ name: Table 2
 ---
 additional_resources: []
 data_file: data3.yaml
-data_license: {description: null, name: null, url: null}
 description: Differential production cross-sections in for prompt $D_{s}^{+} + D_{s}^{-}$
   mesons in bins of $(p_{\mathrm{T}}, y)$. The first uncertainty is statistical, and
   the second is the total systematic.
@@ -74,7 +71,6 @@ name: Table 3
 ---
 additional_resources: []
 data_file: data4.yaml
-data_license: {description: null, name: null, url: null}
 description: Differential production cross-sections in for prompt $D^{*+} + D^{*-}$
   mesons in bins of $(p_{\mathrm{T}}, y)$. The first uncertainty is statistical, and
   the second is the total systematic.
@@ -92,7 +88,6 @@ name: Table 4
 ---
 additional_resources: []
 data_file: data5.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-sections, $R_{13/7}$, for
   prompt $D^{0} + \bar{D}^{0}$ mesons in bins of $(p_{\mathrm{T}}, y)$. The first
   uncertainty is statistical, and the second is the total systematic.
@@ -110,7 +105,6 @@ name: Table 5
 ---
 additional_resources: []
 data_file: data6.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-sections, $R_{13/7}$, for
   prompt $D^{+} + D^{-}$ mesons in bins of $(p_{\mathrm{T}}, y)$. The first uncertainty
   is statistical, and the second is the total systematic.
@@ -128,7 +122,6 @@ name: Table 6
 ---
 additional_resources: []
 data_file: data7.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-sections, $R_{13/7}$, for
   prompt $D_{s}^{+} + D_{s}^{+}$ mesons in bins of $(p_{\mathrm{T}}, y)$. The first
   uncertainty is statistical, and the second is the total systematic.
@@ -146,7 +139,6 @@ name: Table 7
 ---
 additional_resources: []
 data_file: data8.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-sections, $R_{13/7}$, for
   prompt $D^{*+} + D^{*-}$ mesons in bins of $(p_{\mathrm{T}}, y)$. The first uncertainty
   is statistical, and the second is the total systematic.
@@ -164,7 +156,6 @@ name: Table 8
 ---
 additional_resources: []
 data_file: data9.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D^{+}$ and $D^{0}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. The first uncertainty is statistical, and the second is the total systematic.
@@ -183,7 +174,6 @@ name: Table 9
 ---
 additional_resources: []
 data_file: data10.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D_{s}^{+}$ and $D^{0}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. The first uncertainty is statistical, and the second is the total systematic.
@@ -202,7 +192,6 @@ name: Table 10
 ---
 additional_resources: []
 data_file: data11.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D^{*+}$ and $D^{0}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. The first uncertainty is statistical, and the second is the total systematic.
@@ -221,7 +210,6 @@ name: Table 11
 ---
 additional_resources: []
 data_file: data12.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D_{s}^{+}$ and $D^{+}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. The first uncertainty is statistical, and the second is the total systematic.
@@ -240,7 +228,6 @@ name: Table 12
 ---
 additional_resources: []
 data_file: data13.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D^{*+}$ and $D^{+}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. The first uncertainty is statistical, and the second is the total systematic.
@@ -259,7 +246,6 @@ name: Table 13
 ---
 additional_resources: []
 data_file: data14.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D_{s}^{+}$ and $D^{*+}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. The first uncertainty is statistical, and the second is the total systematic.
@@ -278,7 +264,6 @@ name: Table 14
 ---
 additional_resources: []
 data_file: data15.yaml
-data_license: {description: null, name: null, url: null}
 description: Differential production cross-sections in for prompt $D^{0} + \bar{D}^{0}$
   mesons in bins of $(p_{\mathrm{T}}, y)$. Correlation table. Values are rounded to
   the level of $\pm 5\%$.
@@ -296,7 +281,6 @@ name: Table 15
 ---
 additional_resources: []
 data_file: data16.yaml
-data_license: {description: null, name: null, url: null}
 description: Differential production cross-sections in for prompt $D^{+} + D^{-}$
   mesons in bins of $(p_{\mathrm{T}}, y)$. Correlation table. Values are rounded to
   the level of $\pm 5\%$.
@@ -314,7 +298,6 @@ name: Table 16
 ---
 additional_resources: []
 data_file: data17.yaml
-data_license: {description: null, name: null, url: null}
 description: Differential production cross-sections in for prompt $D_{s}^{+} + D_{s}^{-}$
   mesons in bins of $(p_{\mathrm{T}}, y)$. Correlation table. Values are rounded to
   the level of $\pm 5\%$.
@@ -332,7 +315,6 @@ name: Table 17
 ---
 additional_resources: []
 data_file: data18.yaml
-data_license: {description: null, name: null, url: null}
 description: Differential production cross-sections in for prompt $D^{*+} + D^{*-}$
   mesons in bins of $(p_{\mathrm{T}}, y)$. Correlation table. Values are rounded to
   the level of $\pm 5\%$.
@@ -350,7 +332,6 @@ name: Table 18
 ---
 additional_resources: []
 data_file: data19.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-sections, $R_{13/7}$, for
   prompt $D^{0} + D^{0}$ mesons in bins of $(p_{\mathrm{T}}, y)$. Correlation table.
   Values are rounded to the level of $\pm 5\%$.
@@ -368,7 +349,6 @@ name: Table 19
 ---
 additional_resources: []
 data_file: data20.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-sections, $R_{13/7}$, for
   prompt $D^{+} + D^{-}$ mesons in bins of $(p_{\mathrm{T}}, y)$. Correlation table.
   Values are rounded to the level of $\pm 5\%$.
@@ -386,7 +366,6 @@ name: Table 20
 ---
 additional_resources: []
 data_file: data21.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-sections, $R_{13/7}$, for
   prompt $D_{s}^{+} + D_{s}^{+}$ mesons in bins of $(p_{\mathrm{T}}, y)$. Correlation
   table. Values are rounded to the level of $\pm 5\%$.
@@ -404,7 +383,6 @@ name: Table 21
 ---
 additional_resources: []
 data_file: data22.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-sections, $R_{13/7}$, for
   prompt $D^{*+} + D^{*-}$ mesons in bins of $(p_{\mathrm{T}}, y)$. Correlation table.
   Values are rounded to the level of $\pm 5\%$.
@@ -422,7 +400,6 @@ name: Table 22
 ---
 additional_resources: []
 data_file: data23.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D^{+}$ and $D^{0}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. Correlation table. Values are rounded to the level of $\pm 5\%$.
@@ -440,7 +417,6 @@ name: Table 23
 ---
 additional_resources: []
 data_file: data24.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D_{s}^{+}$ and $D^{0}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. Correlation table. Values are rounded to the level of $\pm 5\%$.
@@ -458,7 +434,6 @@ name: Table 24
 ---
 additional_resources: []
 data_file: data25.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D^{*+}$ and $D^{0}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. Correlation table. Values are rounded to the level of $\pm 5\%$.
@@ -476,7 +451,6 @@ name: Table 25
 ---
 additional_resources: []
 data_file: data26.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D_{s}^{+}$ and $D^{+}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. Correlation table. Values are rounded to the level of $\pm 5\%$.
@@ -494,7 +468,6 @@ name: Table 26
 ---
 additional_resources: []
 data_file: data27.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D^{*+}$ and $D^{+}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. Correlation table. Values are rounded to the level of $\pm 5\%$.
@@ -512,7 +485,6 @@ name: Table 27
 ---
 additional_resources: []
 data_file: data28.yaml
-data_license: {description: null, name: null, url: null}
 description: The ratios of differential production cross-section-times-branching fraction
   measurements for prompt $D_{s}^{+}$ and $D^{*+}$ mesons in bins of $(p_{\mathrm{T}},
   y)$. Correlation table. Values are rounded to the level of $\pm 5\%$.

hepdata_converter/testsuite/testdata/oldhepdata/sample.input_single.yaml

@@ -30,7 +30,6 @@ record_ids:
 - {id: 6150, type: durham}
 ---
 additional_resources: []
-data_license: {description: null, name: null, url: null}
 dependent_variables:
 - header: {name: SIG(fiducial), units: FB}
   qualifiers:
@@ -83,7 +82,6 @@ location: Data from Page 17 of preprint
 name: Table 1
 ---
 additional_resources: []
-data_license: {description: null, name: null, url: null}
 dependent_variables:
 - header: {name: SIG(total), units: FB}
   qualifiers:
@@ -114,7 +112,6 @@ location: Data from Page 20 of preprint
 name: Table 2
 ---
 additional_resources: []
-data_license: {description: null, name: null, url: null}
 dependent_variables:
 - header: {name: 10**6 * 1/SIG(fiducial) * D(SIG(fiducial))/DPT, units: GEV**-1}
   qualifiers:
@@ -165,7 +162,6 @@ location: Data from Figure 8A
 name: Table 3
 ---
 additional_resources: []
-data_license: {description: null, name: null, url: null}
 dependent_variables:
 - header: {name: 10**6 * 1/SIG(fiducial) * D(SIG(fiducial))/DPT, units: GEV**-1}
   qualifiers:
@@ -209,7 +205,6 @@ location: Data from Figure 8B
 name: Table 4
 ---
 additional_resources: []
-data_license: {description: null, name: null, url: null}
 dependent_variables:
 - header: {name: '10**6 * 1/SIG(fiducial) * D(SIG(fiducial))/DDELTA(PHI(LEPTON+,LEPTON-))'}
   qualifiers:
@@ -259,7 +254,6 @@ location: Data from Figure 9A
 name: Table 5
 ---
 additional_resources: []
-data_license: {description: null, name: null, url: null}
 dependent_variables:
 - header: {name: '10**6 * 1/SIG(fiducial) * D(SIG(fiducial))/DDELTA(PHI(LEPTON+,LEPTON-))'}
   qualifiers:
@@ -303,7 +297,6 @@ location: Data from Figure 9B
 name: Table 6
 ---
 additional_resources: []
-data_license: {description: null, name: null, url: null}
 dependent_variables:
 - header: {name: 10**6 * 1/SIG(fiducial) * D(SIG(fiducial))/DM(ZZ)}
   qualifiers:
@@ -353,7 +346,6 @@ location: Data from Figure 10A
 name: Table 7
 ---
 additional_resources: []
-data_license: {description: null, name: null, url: null}
 dependent_variables:
 - header: {name: 10**6 * 1/SIG(fiducial) * D(SIG(fiducial))/DMT(ZZ)}
   qualifiers: