Add file_id for papers with multiple files

gammapy · May 16, 2017 · 786e5d1 · 786e5d1
1 parent d596dfa
commit 786e5d1
Show file tree

Hide file tree

Showing 36 changed files with 42 additions and 20 deletions.
diff --git a/docs/data/data/2010A%26A...516A..62A/gammacat_2010A%26A...516A..62A_000074_sed.ecsv b/docs/data/data/2010A%26A...516A..62A/gammacat_2010A%26A...516A..62A_000074_sed.ecsv
@@ -14,6 +14,7 @@
 # - {data_type: sed}
 # - {source_id: 74}
 # - {reference_id: 2010A&A...516A..62A}
+# - {file_id: 2}
 # - {telescope: hess}
 # - {url: 'https://www.mpi-hd.mpg.de/hfm/HESS/pages/publications/auxiliary/AA516_A62.html'}
 # - {UL_CONF: 0.6827}

diff --git a/docs/data/data/2014ApJ...780..168A/gammacat_2014ApJ...780..168A_000030_sed.ecsv b/docs/data/data/2014ApJ...780..168A/gammacat_2014ApJ...780..168A_000030_sed.ecsv
@@ -14,6 +14,7 @@
 # - {data_type: sed}
 # - {source_id: 30}
 # - {reference_id: 2014ApJ...780..168A}
+# - {file_id: 6}
 # - {telescope: hess}
 # - {UL_CONF: 0.95}
 # - {comments: 'Spectral points measured by HESS for orbital phases 0.6-0.9

diff --git a/docs/data/data/2016arXiv161003751S/gammacat_2016arXiv161003751S_000030_sed.ecsv b/docs/data/data/2016arXiv161003751S/gammacat_2016arXiv161003751S_000030_sed.ecsv
@@ -14,6 +14,7 @@
 # - {data_type: sed}
 # - {source_id: 30}
 # - {reference_id: 2016arXiv161003751S}
+# - {file_id: 3}
 # - {telescope: veritas}
 # - {comments: Spectral points measured by VERITAS for orbital phases 0.8-0.2}
 e_ref e_min e_max dnde dnde_errn dnde_errp

diff --git a/docs/data/gammacat-datasets.json b/docs/data/gammacat-datasets.json
@@ -1,10 +1,10 @@
 {
     "info": {
         "name": "gammacat",
-        "version": "e04afb9",
-        "git_version": "e04afb9",
+        "version": "d596dfa",
+        "git_version": "d596dfa",
         "description": "An open data collection and source catalog for gamma-ray astronomy",
-        "datetime": "2017-05-15 19:22:01.350149"
+        "datetime": "2017-05-16 08:47:43.092052"
     },
     "data": [
         {

diff --git a/docs/data/gammacat-sources.json b/docs/data/gammacat-sources.json
@@ -1,10 +1,10 @@
 {
     "info": {
         "name": "gammacat",
-        "version": "e04afb9",
-        "git_version": "e04afb9",
+        "version": "d596dfa",
+        "git_version": "d596dfa",
         "description": "An open data collection and source catalog for gamma-ray astronomy",
-        "datetime": "2017-05-15 19:22:01.350149"
+        "datetime": "2017-05-16 08:47:43.092052"
     },
     "data": [
         {

diff --git a/docs/data/gammacat.fits.gz b/docs/data/gammacat.fits.gz
diff --git a/gammacat/sed.py b/gammacat/sed.py
@@ -33,7 +33,7 @@ class SED:
     ]
 
     allowed_meta_keys = required_meta_keys + [
-        'source_name', 'comments', 'url', 'UL_CONF',
+        'file_id', 'source_name', 'comments', 'url', 'UL_CONF',
     ]
 
     def __init__(self, table, path):

diff --git a/input/data/2010/2010A%26A...516A..62A/tev-000074-1-sed.ecsv b/input/data/2010/2010A%26A...516A..62A/tev-000074-1-sed.ecsv
@@ -10,6 +10,7 @@
 # - data_type: sed
 # - source_id: 74
 # - reference_id: 2010A&A...516A..62A
+# - file_id: 1
 # - telescope: hess
 # - url: https://www.mpi-hd.mpg.de/hfm/HESS/pages/publications/auxiliary/AA516_A62.html
 # - UL_CONF: 0.6827

diff --git a/input/data/2010/2010A%26A...516A..62A/tev-000074-1.yaml b/input/data/2010/2010A%26A...516A..62A/tev-000074-1.yaml
@@ -1,6 +1,7 @@
 # This file contains the data for the north-east (NE) region
 source_id: 74
 reference_id: 2010A&A...516A..62A
+file_id: 1
 telescope: hess
 
 data:

diff --git a/input/data/2010/2010A%26A...516A..62A/tev-000074-2-sed.ecsv b/input/data/2010/2010A%26A...516A..62A/tev-000074-2-sed.ecsv
@@ -10,6 +10,7 @@
 # - data_type: sed
 # - source_id: 74
 # - reference_id: 2010A&A...516A..62A
+# - file_id: 2
 # - telescope: hess
 # - url: https://www.mpi-hd.mpg.de/hfm/HESS/pages/publications/auxiliary/AA516_A62.html
 # - UL_CONF: 0.6827

diff --git a/input/data/2010/2010A%26A...516A..62A/tev-000074-2.yaml b/input/data/2010/2010A%26A...516A..62A/tev-000074-2.yaml
@@ -1,6 +1,7 @@
 # This file contains the data for the south-west (SW) region
 source_id: 74
 reference_id: 2010A&A...516A..62A
+file_id: 2
 telescope: hess
 
 data:

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-1-lc.ecsv b/input/data/2014/2014ApJ...780..168A/tev-000030-1-lc.ecsv
@@ -11,6 +11,7 @@
 # - data_type: lc
 # - source_id: 30
 # - reference_id: 2014ApJ...780..168A
+# - file_id: 1
 # - telescope: hess
 # - {SED_TYPE: flux}
 # - UL_CONF: 0.99

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-1-sed.ecsv b/input/data/2014/2014ApJ...780..168A/tev-000030-1-sed.ecsv
@@ -11,6 +11,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2014ApJ...780..168A
+# - file_id: 1
 # - telescope: veritas
 # - comments: |
 #     Spectral points measured by VERITAS for orbital phases 0.2-0.4

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-1.yaml b/input/data/2014/2014ApJ...780..168A/tev-000030-1.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2014ApJ...780..168A
+file_id: 1
 telescope: veritas
 # Note that this is a joint HESS/VERITAS paper
 
@@ -31,4 +32,3 @@ spec:
   mjd: {min: 55235.0, max: 55280.}
   phase: {min: 0.2, max: 0.4 }
   erange: {min: 0.53, max: 2.07}
-  filecounter: 1
diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-2-lc.ecsv b/input/data/2014/2014ApJ...780..168A/tev-000030-2-lc.ecsv
@@ -11,6 +11,7 @@
 # - data_type: lc
 # - source_id: 30
 # - reference_id: 2014ApJ...780..168A
+# - file_id: 2
 # - telescope: veritas
 # - {SED_TYPE: flux}
 # - UL_CONF: 0.99

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-2-sed.ecsv b/input/data/2014/2014ApJ...780..168A/tev-000030-2-sed.ecsv
@@ -11,6 +11,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2014ApJ...780..168A
+# - file_id: 2
 # - telescope: veritas
 # - comments: |
 #     Spectral points measured by VERITAS for orbital phases 0.2-0.4

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-2.yaml b/input/data/2014/2014ApJ...780..168A/tev-000030-2.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2014ApJ...780..168A
+file_id: 2
 telescope: veritas
 # Note that this is a joint HESS/VERITAS paper
 
@@ -23,4 +24,3 @@ spec:
   mjd: {min: 55544.0, max: 55656.}
   phase: {min: 0.2, max: 0.4}
   erange: {min: 0.53, max: 3.55}
-  filecounter: 2
diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-3-sed.ecsv b/input/data/2014/2014ApJ...780..168A/tev-000030-3-sed.ecsv
@@ -11,6 +11,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2014ApJ...780..168A
+# - file_id: 3
 # - telescope: veritas
 # - comments: |
 #     Spectral points measured by VERITAS for orbital phases 0.2-0.4

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-3.yaml b/input/data/2014/2014ApJ...780..168A/tev-000030-3.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2014ApJ...780..168A
+file_id: 3
 telescope: veritas
 # Note that this is a joint HESS/VERITAS paper
 
@@ -23,4 +24,3 @@ spec:
   mjd: {min: 55890.0, max: 55928.}
   phase: {min: 0.2, max: 0.4 }
   erange: {min: 0.53, max: 7.08}
-  filecounter: 3
diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-4-sed.ecsv b/input/data/2014/2014ApJ...780..168A/tev-000030-4-sed.ecsv
@@ -11,6 +11,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2014ApJ...780..168A
+# - file_id: 4
 # - telescope: veritas
 # - comments: |
 #     Spectral points measured by VERITAS for orbital phases 0.2-0.4

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-4.yaml b/input/data/2014/2014ApJ...780..168A/tev-000030-4.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2014ApJ...780..168A
+file_id: 4
 telescope: veritas
 # Note that this is a joint HESS/VERITAS paper
 
@@ -23,4 +24,3 @@ spec:
   mjd: {min: 55235.0, max: 55928.}
   phase: {min: 0.2, max: 0.4 }
   erange: {min: 0.53, max: 7.08}
-  filecounter: 4
diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-5-sed.ecsv b/input/data/2014/2014ApJ...780..168A/tev-000030-5-sed.ecsv
@@ -9,6 +9,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2014ApJ...780..168A
+# - file_id: 5
 # - telescope: hess
 # - comments: |
 #     Spectral points measured by HESS for orbital phases 0.2-0.4

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-5.yaml b/input/data/2014/2014ApJ...780..168A/tev-000030-5.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2014ApJ...780..168A
+file_id: 5
 telescope: hess
 # Note that this is a joint HESS/VERITAS paper
 
@@ -23,4 +24,3 @@ spec:
   mjd: {min: 53087.0, max: 55951.}
   phase: {min: 0.2, max: 0.4}
   erange: {min: 0.2, max: 12}
-  filecounter: 5
diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-6-sed.ecsv b/input/data/2014/2014ApJ...780..168A/tev-000030-6-sed.ecsv
@@ -10,6 +10,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2014ApJ...780..168A
+# - file_id: 6
 # - telescope: hess
 # - UL_CONF: 0.95
 # - comments: |

diff --git a/input/data/2014/2014ApJ...780..168A/tev-000030-6.yaml b/input/data/2014/2014ApJ...780..168A/tev-000030-6.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2014ApJ...780..168A
+file_id: 6
 telescope: hess
 # Note that this is a joint HESS/VERITAS paper
 
@@ -23,4 +24,3 @@ spec:
   mjd: {min: 53087.0, max: 55951.}
   phase: {min: 0.6, max: 0.9 }
   erange: {min: 0.2, max: 12.}
-  filecounter: 6
diff --git a/input/data/2016/2016arXiv161003751S/tev-000030-1-sed.ecsv b/input/data/2016/2016arXiv161003751S/tev-000030-1-sed.ecsv
@@ -11,6 +11,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2016arXiv161003751S
+# - file_id: 1
 # - telescope: veritas
 # - comments: |
 #     Spectral points measured by VERITAS for orbital phases 0.2-0.4

diff --git a/input/data/2016/2016arXiv161003751S/tev-000030-1.yaml b/input/data/2016/2016arXiv161003751S/tev-000030-1.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2016arXiv161003751S
+file_id: 1
 telescope: veritas
 # Contribution to the 6th International Symposium on High-Energy Gamma-Ray
 # Astronomy (Gamma2016), Heidelberg, Germany
@@ -27,4 +28,3 @@ spec:
   mjd: {min: 55236.0, max: 57456.}
   phase: {min: 0.2, max: 0.4 }
   erange: {min: 0.33, max: 6.31}
-  filecounter: 1
diff --git a/input/data/2016/2016arXiv161003751S/tev-000030-2-sed.ecsv b/input/data/2016/2016arXiv161003751S/tev-000030-2-sed.ecsv
@@ -11,6 +11,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2016arXiv161003751S
+# - file_id: 2
 # - telescope: veritas
 # - comments: |
 #     Spectral points measured by VERITAS for orbital phases 0.6-0.8

diff --git a/input/data/2016/2016arXiv161003751S/tev-000030-2.yaml b/input/data/2016/2016arXiv161003751S/tev-000030-2.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2016arXiv161003751S
+file_id: 2
 telescope: veritas
 # Contribution to the 6th International Symposium on High-Energy Gamma-Ray
 # Astronomy (Gamma2016), Heidelberg, Germany
@@ -27,4 +28,3 @@ spec:
   mjd: {min: 56330.0, max: 56988.416}
   phase: {min: 0.6, max: 0.8 }
   erange: {min: 0.24, max: 4.47}
-  filecounter: 2
diff --git a/input/data/2016/2016arXiv161003751S/tev-000030-3-sed.ecsv b/input/data/2016/2016arXiv161003751S/tev-000030-3-sed.ecsv
@@ -11,6 +11,7 @@
 # - data_type: sed
 # - source_id: 30
 # - reference_id: 2016arXiv161003751S
+# - file_id: 3
 # - telescope: veritas
 # - comments: |
 #     Spectral points measured by VERITAS for orbital phases 0.8-0.2

diff --git a/input/data/2016/2016arXiv161003751S/tev-000030-3.yaml b/input/data/2016/2016arXiv161003751S/tev-000030-3.yaml
@@ -1,5 +1,6 @@
 source_id: 30
 reference_id: 2016arXiv161003751S
+file_id: 3
 telescope: veritas
 # Contribution to the 6th International Symposium on High-Energy Gamma-Ray
 # Astronomy (Gamma2016), Heidelberg, Germany
@@ -27,4 +28,3 @@ spec:
   mjd: {min: 54830.0, max: 57430.220}
   phase: {min: 0.8, max: 0.2 }
   erange: {min: 0.28, max: 6.31}
-  filecounter: 3
diff --git a/input/data/2017/2017ApJ...834....2A/tev-000049-lc-1.ecsv b/input/data/2017/2017ApJ...834....2A/tev-000049-lc-1.ecsv
@@ -10,6 +10,7 @@
 # - data_type: lc
 # - source_id: 49
 # - reference_id: 2017ApJ...834....2A
+# - file_id: 1
 # - telescope: veritas
 # - {SED_TYPE: flux}
 # - comments: 10 min

diff --git a/input/data/2017/2017ApJ...834....2A/tev-000049-lc-2.ecsv b/input/data/2017/2017ApJ...834....2A/tev-000049-lc-2.ecsv
@@ -12,6 +12,7 @@
 # - data_type: lc
 # - source_id: 49
 # - reference_id: 2017ApJ...834....2A
+# - file_id: 2
 # - telescope: veritas
 # - {SED_TYPE: flux}
 # - comments: 10 min

diff --git a/input/data/2017/2017ApJ...834....2A/tev-000049-sed-1.ecsv b/input/data/2017/2017ApJ...834....2A/tev-000049-sed-1.ecsv
@@ -8,6 +8,7 @@
 # - data_type: sed
 # - source_id: 49
 # - reference_id: 2017ApJ...834....2A
+# - file_id: 1
 # - telescope: veritas
 # - comments: |
 #       Spectrum for 2014-04-29

diff --git a/input/data/2017/2017ApJ...834....2A/tev-000049-sed-2.ecsv b/input/data/2017/2017ApJ...834....2A/tev-000049-sed-2.ecsv
@@ -8,6 +8,7 @@
 # - data_type: sed
 # - source_id: 49
 # - reference_id: 2017ApJ...834....2A
+# - file_id: 2
 # - telescope: veritas
 # - comments: |
 #       Spectrum for 2014-05-03.

diff --git a/input/schemas/dataset_source_info.schema.yaml b/input/schemas/dataset_source_info.schema.yaml
@@ -10,6 +10,10 @@ properties:
     type: string
     description: Dataset reference identifier
 
+  file_id:
+    type: integer
+    description: Counter for cases where multiple measurements are given in a paper for a given source (e.g. for sub-regions).
+
   telescope:
     "$ref": "#/definitions/telescope"
 
@@ -250,10 +254,6 @@ properties:
           min: {type: number}
           max: {type: number}
 
-      filecounter:
-        type: number
-        description: Counter to connect spectral fit with SED file
-
   notes:
     type: string
     description: Hand-written, free-format notes