From ccd32e404d9eaa402186a71c1f1a9a91d7c9cece Mon Sep 17 00:00:00 2001 From: Jordan Padams Date: Fri, 9 Feb 2024 10:59:16 -0800 Subject: [PATCH 1/3] Update test to include unlabeled files check Test for #6 was not sufficient for checking for unlabeled files, which is why some regression snuck into the code. This commit also includes some cleanup of the test data since they are not needed for this test. Refs #822 --- src/test/resources/features/developer.feature | 3 +- .../github6/valid/bundle_kaguya_derived_2.xml | 130 ------------------ .../github6/valid/bundle_kaguya_derived_3.xml | 130 ------------------ .../github6/valid/bundle_kaguya_derived_4.xml | 130 ------------------ .../github6/valid/bundle_kaguya_derived_5.xml | 130 ------------------ .../github6/valid/bundle_kaguya_derived_6.xml | 130 ------------------ .../github6/valid/bundle_kaguya_derived_7.xml | 130 ------------------ 7 files changed, 2 insertions(+), 781 deletions(-) delete mode 100644 src/test/resources/github6/valid/bundle_kaguya_derived_2.xml delete mode 100644 src/test/resources/github6/valid/bundle_kaguya_derived_3.xml delete mode 100644 src/test/resources/github6/valid/bundle_kaguya_derived_4.xml delete mode 100644 src/test/resources/github6/valid/bundle_kaguya_derived_5.xml delete mode 100644 src/test/resources/github6/valid/bundle_kaguya_derived_6.xml delete mode 100644 src/test/resources/github6/valid/bundle_kaguya_derived_7.xml diff --git a/src/test/resources/features/developer.feature b/src/test/resources/features/developer.feature index ae4770007..b88a88771 100644 --- a/src/test/resources/features/developer.feature +++ b/src/test/resources/features/developer.feature @@ -188,7 +188,8 @@ Scenario Outline: Execute validate command for tests below. |"NASA-PDS/validate#51 2" | "github51" | 2 | "2 errors expected for GENERAL_INFO." | "GENERAL_INFO" | "src/test/resources" | "target/test" | "-R pds4.bundle --alternate_file_paths src/test/resources/github51_additionals/additional_dir1/data_spectra,src/test/resources/github51_additionals/additional_dir2/data_spectra --skip-product-validation --skip-content-validation -r {reportDir}/report_github51_2.json -s json -t {resourceDir}/github51/valid" | "report_github51_2.json" | # |"NASA-PDS/validate#6 1" | "github6" | 7 | "7 errors expected for FILE_NAME_HAS_INVALID_CHARS,UNALLOWED_BASE_NAME,UNALLOWED_FILE_NAME,DIR_NAME_HAS_INVALID_CHARS." | "FILE_NAME_HAS_INVALID_CHARS,UNALLOWED_BASE_NAME,UNALLOWED_FILE_NAME,DIR_NAME_HAS_INVALID_CHARS" | "src/test/resources" | "target/test" | "-R pds4.bundle -r {reportDir}/report_github6_bundle_invalid_cucumber.json -s json {resourceDir}/github6/invalid/bundle_kaguya_derived.xml" | "report_github6_bundle_invalid_cucumber.json" | - |"NASA-PDS/validate#6 2" | "github6" | 0 | "0 errors expected for totalErrors." | "totalErrors" | "src/test/resources" | "target/test" | "-R pds4.bundle -r {reportDir}/report_github6_bundle_valid_cucumber.json -s json {resourceDir}/github6/valid/bundle_kaguya_derived.xml" | "report_github6_bundle_valid_cucumber.json" | + |"NASA-PDS/validate#6 2" | "github6" | 7 | "7 warnings expected for warning.file.not_referenced_in_label." | "UNLABELED_FILE" | "src/test/resources" | "target/test" | "-R pds4.bundle -r {reportDir}/report_github6_2.json -s json {resourceDir}/github6/invalid/bundle_kaguya_derived_7.xml" | "report_github6_2.json" | + |"NASA-PDS/validate#6 3" | "github6" | 0 | "0 errors expected for totalErrors." | "totalErrors" | "src/test/resources" | "target/test" | "-R pds4.bundle -r {reportDir}/report_github6_3.json -s json {resourceDir}/github6/valid/bundle_kaguya_derived.xml" | "report_github6_3.json" | |"NASA-PDS/validate#240 1" | "github240" | 0 | "0 errors expected for totalErrors." | "totalErrors" | "src/test/resources" | "target/test" | "-R pds4.bundle -r {reportDir}/report_github240_bundle_valid_cucumber.json -s json {resourceDir}/github240/valid/bundle_kaguya_derived.xml" | "report_github240_bundle_valid_cucumber.json" | |"NASA-PDS/validate#240 2" | "github240" | 3 | "3 warnings expected for UNALLOWED_BUNDLE_SUBDIR_NAME." | "UNALLOWED_BUNDLE_SUBDIR_NAME" | "src/test/resources" | "target/test" | "-R pds4.bundle -r {reportDir}/report_github240_bundle_invalid_cucumber.json -s json {resourceDir}/github240/invalid/bundle_kaguya_derived.xml" | "report_github240_bundle_invalid_cucumber.json" | diff --git a/src/test/resources/github6/valid/bundle_kaguya_derived_2.xml b/src/test/resources/github6/valid/bundle_kaguya_derived_2.xml deleted file mode 100644 index 176ad513d..000000000 --- a/src/test/resources/github6/valid/bundle_kaguya_derived_2.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - urn:nasa:pds:kaguya_grs_spectra - 1.2 - Kaguya Gamma-Ray Spectrometer Corrected Spectra Bundle - 1.11.0.0 - Product_Bundle - - 2019 - - This archive contains Kaguya Gamma-Ray Spectrometer (KGRS) corrected and calibrated time-series - spectra and ephemerides, pointing, and geometry (EPG) data for the nominal and extended observation - periods of JAXA's SELENE (Kaguya) mission. - - The SELENE mission was the Japanese mission to the Moon with a main orbiter “Kaguya” and - two daughter relay satellites launched on Sep. 14, 2007. KGRS was mounted on the deck of the - main orbiter. It employed a high-purity Ge (HPGe) crystal as a main detector, and surrounding - BGO and plastic scintillators as anti-coincidence detectors to reduce backgrounds. The - Ge crystal was cooled by a Sterling refrigerator. It made close-proximity observations of the - Moon from Dec. 14, 2007 to Dec. 11, 2008 at the high circular orbital altitude of 100 km, and - from Feb. 10 to May 28 in 2009 at the low elliptical orbital altitude of ~30 x 50 km. - - KGRS recorded energy spectra of gamma rays in two gain modes simultaneously; high gain (0.1 - to 3 MeV) and low gain (0.1 to 13 MeV), each of which was analyzed by the 13-bit (8192 ch) - analog-to-digital converter (ADC). While the former has a higher spectral resolution over the - energy range of radioactive elements, the latter has better statistics and covers the whole energy - range of major rock-forming elements, including the Fe neutron capture line at 7.6 MeV. The - accumulation time of each spectrum was 17 s. Both modes of spectra are included in this archive. - - The observation epochs of KGRS consists of three regular measurement periods (Period 1 to 3), - background measurements, and the annealing of the Ge crystal. The HPGe detector was annealed - from 16 to 25, December 2008, which improved energy resolution by a factor of two. - Period 1 and 2 lasted two and five months, respectively, with limited spatial or spectral - resolutions. Period 3 lasted ~3.5 months (including dead time) with the best spatial and spectral - resolutions. In addition, spectra from the background measurement when the satellite was flipped - and the detector faced deep space can be analyzed to estimate the background gamma-ray intensity - from the satellite due to the exposure to galactic cosmic rays. - - This archive consists of three spectrum files (each corresponding to one KGRS epoch) and one unified - EPG file. The spectrum files contain a time series of corrected and calibrated pulse height spectra - acquired by KGRS's HPGe detector in the lunar orbit. In the spectrum files, each row contains the - spacecraft clock (sclk) ticks and UTC time corresponding to the end of the accumulation interval - (17 s), with the two sets of the 8192-channel HPGe spectra accumulated. In the EPG file, each row - starts with sclk recorded at the end of the accumulation interval to match spacecraft positions, - pointing, and correction factors with the corrected spectra. Note that the UTC time and ephemeris time - included in the EPG file correspond to the midpoint of the accumulation interval. - - The Kaguya Gamma-Ray Spectrometer Corrected Spectra bundle was created by Naoyuki Yamashita at Planetary - Science Institute, AZ, USA, with the permission of JAXA and the KGRS instrument PI Prof. Nobuyuki Hasebe. - This work was supported by the NASA under Grant No. NNX16AG54G issued through the Planetary Data Archiving, - Restoration, and Tools Program (PDART), Research Opportunities in Space and Earth Sciences (ROSES) 2015. - - - - - 2019-09-30 - 1.0 - Peer reviewed version of Kaguya Gamma-Ray Spectrometer Corrected Spectra PDS4 - - - - - - 2007-12-14T04:15:35Z - 2009-05-28T07:43:22Z - - - Science - Derived - - - Kaguya - Mission - - urn:nasa:pds:context:investigation:mission.kaguya - bundle_to_investigation - - - - Kaguya - - Kaguya - Spacecraft - - urn:nasa:pds:context:instrument_host:spacecraft.kaguya - is_instrument_host - - - - GRS - Instrument - - urn:nasa:pds:context:instrument:kaguya.grs - is_instrument - - - - - Moon - Satellite - - urn:nasa:pds:context:target:satellite.earth.moon - collection_to_target - - - - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_calibrated_spectra - bundle_to_document - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_ephemerides_doc - bundle_to_document - - - - Archive - - - urn:nasa:pds:kaguya_grs_spectra:data_spectra::2.0 - Primary - bundle_has_data_collection - - diff --git a/src/test/resources/github6/valid/bundle_kaguya_derived_3.xml b/src/test/resources/github6/valid/bundle_kaguya_derived_3.xml deleted file mode 100644 index d14335da8..000000000 --- a/src/test/resources/github6/valid/bundle_kaguya_derived_3.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - urn:nasa:pds:kaguya_grs_spectra - 1.3 - Kaguya Gamma-Ray Spectrometer Corrected Spectra Bundle - 1.11.0.0 - Product_Bundle - - 2019 - - This archive contains Kaguya Gamma-Ray Spectrometer (KGRS) corrected and calibrated time-series - spectra and ephemerides, pointing, and geometry (EPG) data for the nominal and extended observation - periods of JAXA's SELENE (Kaguya) mission. - - The SELENE mission was the Japanese mission to the Moon with a main orbiter “Kaguya” and - two daughter relay satellites launched on Sep. 14, 2007. KGRS was mounted on the deck of the - main orbiter. It employed a high-purity Ge (HPGe) crystal as a main detector, and surrounding - BGO and plastic scintillators as anti-coincidence detectors to reduce backgrounds. The - Ge crystal was cooled by a Sterling refrigerator. It made close-proximity observations of the - Moon from Dec. 14, 2007 to Dec. 11, 2008 at the high circular orbital altitude of 100 km, and - from Feb. 10 to May 28 in 2009 at the low elliptical orbital altitude of ~30 x 50 km. - - KGRS recorded energy spectra of gamma rays in two gain modes simultaneously; high gain (0.1 - to 3 MeV) and low gain (0.1 to 13 MeV), each of which was analyzed by the 13-bit (8192 ch) - analog-to-digital converter (ADC). While the former has a higher spectral resolution over the - energy range of radioactive elements, the latter has better statistics and covers the whole energy - range of major rock-forming elements, including the Fe neutron capture line at 7.6 MeV. The - accumulation time of each spectrum was 17 s. Both modes of spectra are included in this archive. - - The observation epochs of KGRS consists of three regular measurement periods (Period 1 to 3), - background measurements, and the annealing of the Ge crystal. The HPGe detector was annealed - from 16 to 25, December 2008, which improved energy resolution by a factor of two. - Period 1 and 2 lasted two and five months, respectively, with limited spatial or spectral - resolutions. Period 3 lasted ~3.5 months (including dead time) with the best spatial and spectral - resolutions. In addition, spectra from the background measurement when the satellite was flipped - and the detector faced deep space can be analyzed to estimate the background gamma-ray intensity - from the satellite due to the exposure to galactic cosmic rays. - - This archive consists of three spectrum files (each corresponding to one KGRS epoch) and one unified - EPG file. The spectrum files contain a time series of corrected and calibrated pulse height spectra - acquired by KGRS's HPGe detector in the lunar orbit. In the spectrum files, each row contains the - spacecraft clock (sclk) ticks and UTC time corresponding to the end of the accumulation interval - (17 s), with the two sets of the 8192-channel HPGe spectra accumulated. In the EPG file, each row - starts with sclk recorded at the end of the accumulation interval to match spacecraft positions, - pointing, and correction factors with the corrected spectra. Note that the UTC time and ephemeris time - included in the EPG file correspond to the midpoint of the accumulation interval. - - The Kaguya Gamma-Ray Spectrometer Corrected Spectra bundle was created by Naoyuki Yamashita at Planetary - Science Institute, AZ, USA, with the permission of JAXA and the KGRS instrument PI Prof. Nobuyuki Hasebe. - This work was supported by the NASA under Grant No. NNX16AG54G issued through the Planetary Data Archiving, - Restoration, and Tools Program (PDART), Research Opportunities in Space and Earth Sciences (ROSES) 2015. - - - - - 2019-09-30 - 1.0 - Peer reviewed version of Kaguya Gamma-Ray Spectrometer Corrected Spectra PDS4 - - - - - - 2007-12-14T04:15:35Z - 2009-05-28T07:43:22Z - - - Science - Derived - - - Kaguya - Mission - - urn:nasa:pds:context:investigation:mission.kaguya - bundle_to_investigation - - - - Kaguya - - Kaguya - Spacecraft - - urn:nasa:pds:context:instrument_host:spacecraft.kaguya - is_instrument_host - - - - GRS - Instrument - - urn:nasa:pds:context:instrument:kaguya.grs - is_instrument - - - - - Moon - Satellite - - urn:nasa:pds:context:target:satellite.earth.moon - collection_to_target - - - - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_calibrated_spectra - bundle_to_document - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_ephemerides_doc - bundle_to_document - - - - Archive - - - urn:nasa:pds:kaguya_grs_spectra:data_spectra::3.0 - Primary - bundle_has_data_collection - - diff --git a/src/test/resources/github6/valid/bundle_kaguya_derived_4.xml b/src/test/resources/github6/valid/bundle_kaguya_derived_4.xml deleted file mode 100644 index 6f88dc037..000000000 --- a/src/test/resources/github6/valid/bundle_kaguya_derived_4.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - urn:nasa:pds:kaguya_grs_spectra - 1.4 - Kaguya Gamma-Ray Spectrometer Corrected Spectra Bundle - 1.11.0.0 - Product_Bundle - - 2019 - - This archive contains Kaguya Gamma-Ray Spectrometer (KGRS) corrected and calibrated time-series - spectra and ephemerides, pointing, and geometry (EPG) data for the nominal and extended observation - periods of JAXA's SELENE (Kaguya) mission. - - The SELENE mission was the Japanese mission to the Moon with a main orbiter “Kaguya” and - two daughter relay satellites launched on Sep. 14, 2007. KGRS was mounted on the deck of the - main orbiter. It employed a high-purity Ge (HPGe) crystal as a main detector, and surrounding - BGO and plastic scintillators as anti-coincidence detectors to reduce backgrounds. The - Ge crystal was cooled by a Sterling refrigerator. It made close-proximity observations of the - Moon from Dec. 14, 2007 to Dec. 11, 2008 at the high circular orbital altitude of 100 km, and - from Feb. 10 to May 28 in 2009 at the low elliptical orbital altitude of ~30 x 50 km. - - KGRS recorded energy spectra of gamma rays in two gain modes simultaneously; high gain (0.1 - to 3 MeV) and low gain (0.1 to 13 MeV), each of which was analyzed by the 13-bit (8192 ch) - analog-to-digital converter (ADC). While the former has a higher spectral resolution over the - energy range of radioactive elements, the latter has better statistics and covers the whole energy - range of major rock-forming elements, including the Fe neutron capture line at 7.6 MeV. The - accumulation time of each spectrum was 17 s. Both modes of spectra are included in this archive. - - The observation epochs of KGRS consists of three regular measurement periods (Period 1 to 3), - background measurements, and the annealing of the Ge crystal. The HPGe detector was annealed - from 16 to 25, December 2008, which improved energy resolution by a factor of two. - Period 1 and 2 lasted two and five months, respectively, with limited spatial or spectral - resolutions. Period 3 lasted ~3.5 months (including dead time) with the best spatial and spectral - resolutions. In addition, spectra from the background measurement when the satellite was flipped - and the detector faced deep space can be analyzed to estimate the background gamma-ray intensity - from the satellite due to the exposure to galactic cosmic rays. - - This archive consists of three spectrum files (each corresponding to one KGRS epoch) and one unified - EPG file. The spectrum files contain a time series of corrected and calibrated pulse height spectra - acquired by KGRS's HPGe detector in the lunar orbit. In the spectrum files, each row contains the - spacecraft clock (sclk) ticks and UTC time corresponding to the end of the accumulation interval - (17 s), with the two sets of the 8192-channel HPGe spectra accumulated. In the EPG file, each row - starts with sclk recorded at the end of the accumulation interval to match spacecraft positions, - pointing, and correction factors with the corrected spectra. Note that the UTC time and ephemeris time - included in the EPG file correspond to the midpoint of the accumulation interval. - - The Kaguya Gamma-Ray Spectrometer Corrected Spectra bundle was created by Naoyuki Yamashita at Planetary - Science Institute, AZ, USA, with the permission of JAXA and the KGRS instrument PI Prof. Nobuyuki Hasebe. - This work was supported by the NASA under Grant No. NNX16AG54G issued through the Planetary Data Archiving, - Restoration, and Tools Program (PDART), Research Opportunities in Space and Earth Sciences (ROSES) 2015. - - - - - 2019-09-30 - 1.0 - Peer reviewed version of Kaguya Gamma-Ray Spectrometer Corrected Spectra PDS4 - - - - - - 2007-12-14T04:15:35Z - 2009-05-28T07:43:22Z - - - Science - Derived - - - Kaguya - Mission - - urn:nasa:pds:context:investigation:mission.kaguya - bundle_to_investigation - - - - Kaguya - - Kaguya - Spacecraft - - urn:nasa:pds:context:instrument_host:spacecraft.kaguya - is_instrument_host - - - - GRS - Instrument - - urn:nasa:pds:context:instrument:kaguya.grs - is_instrument - - - - - Moon - Satellite - - urn:nasa:pds:context:target:satellite.earth.moon - collection_to_target - - - - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_calibrated_spectra - bundle_to_document - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_ephemerides_doc - bundle_to_document - - - - Archive - - - urn:nasa:pds:kaguya_grs_spectra:data_spectra::4.0 - Primary - bundle_has_data_collection - - diff --git a/src/test/resources/github6/valid/bundle_kaguya_derived_5.xml b/src/test/resources/github6/valid/bundle_kaguya_derived_5.xml deleted file mode 100644 index b1015772f..000000000 --- a/src/test/resources/github6/valid/bundle_kaguya_derived_5.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - urn:nasa:pds:kaguya_grs_spectra - 1.5 - Kaguya Gamma-Ray Spectrometer Corrected Spectra Bundle - 1.11.0.0 - Product_Bundle - - 2019 - - This archive contains Kaguya Gamma-Ray Spectrometer (KGRS) corrected and calibrated time-series - spectra and ephemerides, pointing, and geometry (EPG) data for the nominal and extended observation - periods of JAXA's SELENE (Kaguya) mission. - - The SELENE mission was the Japanese mission to the Moon with a main orbiter “Kaguya” and - two daughter relay satellites launched on Sep. 14, 2007. KGRS was mounted on the deck of the - main orbiter. It employed a high-purity Ge (HPGe) crystal as a main detector, and surrounding - BGO and plastic scintillators as anti-coincidence detectors to reduce backgrounds. The - Ge crystal was cooled by a Sterling refrigerator. It made close-proximity observations of the - Moon from Dec. 14, 2007 to Dec. 11, 2008 at the high circular orbital altitude of 100 km, and - from Feb. 10 to May 28 in 2009 at the low elliptical orbital altitude of ~30 x 50 km. - - KGRS recorded energy spectra of gamma rays in two gain modes simultaneously; high gain (0.1 - to 3 MeV) and low gain (0.1 to 13 MeV), each of which was analyzed by the 13-bit (8192 ch) - analog-to-digital converter (ADC). While the former has a higher spectral resolution over the - energy range of radioactive elements, the latter has better statistics and covers the whole energy - range of major rock-forming elements, including the Fe neutron capture line at 7.6 MeV. The - accumulation time of each spectrum was 17 s. Both modes of spectra are included in this archive. - - The observation epochs of KGRS consists of three regular measurement periods (Period 1 to 3), - background measurements, and the annealing of the Ge crystal. The HPGe detector was annealed - from 16 to 25, December 2008, which improved energy resolution by a factor of two. - Period 1 and 2 lasted two and five months, respectively, with limited spatial or spectral - resolutions. Period 3 lasted ~3.5 months (including dead time) with the best spatial and spectral - resolutions. In addition, spectra from the background measurement when the satellite was flipped - and the detector faced deep space can be analyzed to estimate the background gamma-ray intensity - from the satellite due to the exposure to galactic cosmic rays. - - This archive consists of three spectrum files (each corresponding to one KGRS epoch) and one unified - EPG file. The spectrum files contain a time series of corrected and calibrated pulse height spectra - acquired by KGRS's HPGe detector in the lunar orbit. In the spectrum files, each row contains the - spacecraft clock (sclk) ticks and UTC time corresponding to the end of the accumulation interval - (17 s), with the two sets of the 8192-channel HPGe spectra accumulated. In the EPG file, each row - starts with sclk recorded at the end of the accumulation interval to match spacecraft positions, - pointing, and correction factors with the corrected spectra. Note that the UTC time and ephemeris time - included in the EPG file correspond to the midpoint of the accumulation interval. - - The Kaguya Gamma-Ray Spectrometer Corrected Spectra bundle was created by Naoyuki Yamashita at Planetary - Science Institute, AZ, USA, with the permission of JAXA and the KGRS instrument PI Prof. Nobuyuki Hasebe. - This work was supported by the NASA under Grant No. NNX16AG54G issued through the Planetary Data Archiving, - Restoration, and Tools Program (PDART), Research Opportunities in Space and Earth Sciences (ROSES) 2015. - - - - - 2019-09-30 - 1.0 - Peer reviewed version of Kaguya Gamma-Ray Spectrometer Corrected Spectra PDS4 - - - - - - 2007-12-14T04:15:35Z - 2009-05-28T07:43:22Z - - - Science - Derived - - - Kaguya - Mission - - urn:nasa:pds:context:investigation:mission.kaguya - bundle_to_investigation - - - - Kaguya - - Kaguya - Spacecraft - - urn:nasa:pds:context:instrument_host:spacecraft.kaguya - is_instrument_host - - - - GRS - Instrument - - urn:nasa:pds:context:instrument:kaguya.grs - is_instrument - - - - - Moon - Satellite - - urn:nasa:pds:context:target:satellite.earth.moon - collection_to_target - - - - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_calibrated_spectra - bundle_to_document - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_ephemerides_doc - bundle_to_document - - - - Archive - - - urn:nasa:pds:kaguya_grs_spectra:data_spectra::5.0 - Primary - bundle_has_data_collection - - diff --git a/src/test/resources/github6/valid/bundle_kaguya_derived_6.xml b/src/test/resources/github6/valid/bundle_kaguya_derived_6.xml deleted file mode 100644 index 6450886c3..000000000 --- a/src/test/resources/github6/valid/bundle_kaguya_derived_6.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - urn:nasa:pds:kaguya_grs_spectra - 1.6 - Kaguya Gamma-Ray Spectrometer Corrected Spectra Bundle - 1.11.0.0 - Product_Bundle - - 2019 - - This archive contains Kaguya Gamma-Ray Spectrometer (KGRS) corrected and calibrated time-series - spectra and ephemerides, pointing, and geometry (EPG) data for the nominal and extended observation - periods of JAXA's SELENE (Kaguya) mission. - - The SELENE mission was the Japanese mission to the Moon with a main orbiter “Kaguya” and - two daughter relay satellites launched on Sep. 14, 2007. KGRS was mounted on the deck of the - main orbiter. It employed a high-purity Ge (HPGe) crystal as a main detector, and surrounding - BGO and plastic scintillators as anti-coincidence detectors to reduce backgrounds. The - Ge crystal was cooled by a Sterling refrigerator. It made close-proximity observations of the - Moon from Dec. 14, 2007 to Dec. 11, 2008 at the high circular orbital altitude of 100 km, and - from Feb. 10 to May 28 in 2009 at the low elliptical orbital altitude of ~30 x 50 km. - - KGRS recorded energy spectra of gamma rays in two gain modes simultaneously; high gain (0.1 - to 3 MeV) and low gain (0.1 to 13 MeV), each of which was analyzed by the 13-bit (8192 ch) - analog-to-digital converter (ADC). While the former has a higher spectral resolution over the - energy range of radioactive elements, the latter has better statistics and covers the whole energy - range of major rock-forming elements, including the Fe neutron capture line at 7.6 MeV. The - accumulation time of each spectrum was 17 s. Both modes of spectra are included in this archive. - - The observation epochs of KGRS consists of three regular measurement periods (Period 1 to 3), - background measurements, and the annealing of the Ge crystal. The HPGe detector was annealed - from 16 to 25, December 2008, which improved energy resolution by a factor of two. - Period 1 and 2 lasted two and five months, respectively, with limited spatial or spectral - resolutions. Period 3 lasted ~3.5 months (including dead time) with the best spatial and spectral - resolutions. In addition, spectra from the background measurement when the satellite was flipped - and the detector faced deep space can be analyzed to estimate the background gamma-ray intensity - from the satellite due to the exposure to galactic cosmic rays. - - This archive consists of three spectrum files (each corresponding to one KGRS epoch) and one unified - EPG file. The spectrum files contain a time series of corrected and calibrated pulse height spectra - acquired by KGRS's HPGe detector in the lunar orbit. In the spectrum files, each row contains the - spacecraft clock (sclk) ticks and UTC time corresponding to the end of the accumulation interval - (17 s), with the two sets of the 8192-channel HPGe spectra accumulated. In the EPG file, each row - starts with sclk recorded at the end of the accumulation interval to match spacecraft positions, - pointing, and correction factors with the corrected spectra. Note that the UTC time and ephemeris time - included in the EPG file correspond to the midpoint of the accumulation interval. - - The Kaguya Gamma-Ray Spectrometer Corrected Spectra bundle was created by Naoyuki Yamashita at Planetary - Science Institute, AZ, USA, with the permission of JAXA and the KGRS instrument PI Prof. Nobuyuki Hasebe. - This work was supported by the NASA under Grant No. NNX16AG54G issued through the Planetary Data Archiving, - Restoration, and Tools Program (PDART), Research Opportunities in Space and Earth Sciences (ROSES) 2015. - - - - - 2019-09-30 - 1.0 - Peer reviewed version of Kaguya Gamma-Ray Spectrometer Corrected Spectra PDS4 - - - - - - 2007-12-14T04:15:35Z - 2009-05-28T07:43:22Z - - - Science - Derived - - - Kaguya - Mission - - urn:nasa:pds:context:investigation:mission.kaguya - bundle_to_investigation - - - - Kaguya - - Kaguya - Spacecraft - - urn:nasa:pds:context:instrument_host:spacecraft.kaguya - is_instrument_host - - - - GRS - Instrument - - urn:nasa:pds:context:instrument:kaguya.grs - is_instrument - - - - - Moon - Satellite - - urn:nasa:pds:context:target:satellite.earth.moon - collection_to_target - - - - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_calibrated_spectra - bundle_to_document - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_ephemerides_doc - bundle_to_document - - - - Archive - - - urn:nasa:pds:kaguya_grs_spectra:data_spectra - Primary - bundle_has_data_collection - - diff --git a/src/test/resources/github6/valid/bundle_kaguya_derived_7.xml b/src/test/resources/github6/valid/bundle_kaguya_derived_7.xml deleted file mode 100644 index f3d219b8a..000000000 --- a/src/test/resources/github6/valid/bundle_kaguya_derived_7.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - urn:nasa:pds:kaguya_grs_spectra - 1.7 - Kaguya Gamma-Ray Spectrometer Corrected Spectra Bundle - 1.11.0.0 - Product_Bundle - - 2019 - - This archive contains Kaguya Gamma-Ray Spectrometer (KGRS) corrected and calibrated time-series - spectra and ephemerides, pointing, and geometry (EPG) data for the nominal and extended observation - periods of JAXA's SELENE (Kaguya) mission. - - The SELENE mission was the Japanese mission to the Moon with a main orbiter “Kaguya” and - two daughter relay satellites launched on Sep. 14, 2007. KGRS was mounted on the deck of the - main orbiter. It employed a high-purity Ge (HPGe) crystal as a main detector, and surrounding - BGO and plastic scintillators as anti-coincidence detectors to reduce backgrounds. The - Ge crystal was cooled by a Sterling refrigerator. It made close-proximity observations of the - Moon from Dec. 14, 2007 to Dec. 11, 2008 at the high circular orbital altitude of 100 km, and - from Feb. 10 to May 28 in 2009 at the low elliptical orbital altitude of ~30 x 50 km. - - KGRS recorded energy spectra of gamma rays in two gain modes simultaneously; high gain (0.1 - to 3 MeV) and low gain (0.1 to 13 MeV), each of which was analyzed by the 13-bit (8192 ch) - analog-to-digital converter (ADC). While the former has a higher spectral resolution over the - energy range of radioactive elements, the latter has better statistics and covers the whole energy - range of major rock-forming elements, including the Fe neutron capture line at 7.6 MeV. The - accumulation time of each spectrum was 17 s. Both modes of spectra are included in this archive. - - The observation epochs of KGRS consists of three regular measurement periods (Period 1 to 3), - background measurements, and the annealing of the Ge crystal. The HPGe detector was annealed - from 16 to 25, December 2008, which improved energy resolution by a factor of two. - Period 1 and 2 lasted two and five months, respectively, with limited spatial or spectral - resolutions. Period 3 lasted ~3.5 months (including dead time) with the best spatial and spectral - resolutions. In addition, spectra from the background measurement when the satellite was flipped - and the detector faced deep space can be analyzed to estimate the background gamma-ray intensity - from the satellite due to the exposure to galactic cosmic rays. - - This archive consists of three spectrum files (each corresponding to one KGRS epoch) and one unified - EPG file. The spectrum files contain a time series of corrected and calibrated pulse height spectra - acquired by KGRS's HPGe detector in the lunar orbit. In the spectrum files, each row contains the - spacecraft clock (sclk) ticks and UTC time corresponding to the end of the accumulation interval - (17 s), with the two sets of the 8192-channel HPGe spectra accumulated. In the EPG file, each row - starts with sclk recorded at the end of the accumulation interval to match spacecraft positions, - pointing, and correction factors with the corrected spectra. Note that the UTC time and ephemeris time - included in the EPG file correspond to the midpoint of the accumulation interval. - - The Kaguya Gamma-Ray Spectrometer Corrected Spectra bundle was created by Naoyuki Yamashita at Planetary - Science Institute, AZ, USA, with the permission of JAXA and the KGRS instrument PI Prof. Nobuyuki Hasebe. - This work was supported by the NASA under Grant No. NNX16AG54G issued through the Planetary Data Archiving, - Restoration, and Tools Program (PDART), Research Opportunities in Space and Earth Sciences (ROSES) 2015. - - - - - 2019-09-30 - 1.0 - Peer reviewed version of Kaguya Gamma-Ray Spectrometer Corrected Spectra PDS4 - - - - - - 2007-12-14T04:15:35Z - 2009-05-28T07:43:22Z - - - Science - Derived - - - Kaguya - Mission - - urn:nasa:pds:context:investigation:mission.kaguya - bundle_to_investigation - - - - Kaguya - - Kaguya - Spacecraft - - urn:nasa:pds:context:instrument_host:spacecraft.kaguya - is_instrument_host - - - - GRS - Instrument - - urn:nasa:pds:context:instrument:kaguya.grs - is_instrument - - - - - Moon - Satellite - - urn:nasa:pds:context:target:satellite.earth.moon - collection_to_target - - - - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_calibrated_spectra - bundle_to_document - - - urn:nasa:pds:kaguya_grs_spectra:document:kgrs_ephemerides_doc - bundle_to_document - - - - Archive - - - urn:nasa:pds:kaguya_grs_spectra:data_spectra::1.5 - Primary - bundle_has_data_collection - - From 9d611eff3582e25666a006ea6cf1b8c1d2e19634 Mon Sep 17 00:00:00 2001 From: Al Niessner Date: Thu, 22 Feb 2024 10:50:55 -0800 Subject: [PATCH 2/3] butchered eclipse again and had to make this change for compilation --- src/main/java/gov/nasa/pds/validate/ri/AuthInformation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gov/nasa/pds/validate/ri/AuthInformation.java b/src/main/java/gov/nasa/pds/validate/ri/AuthInformation.java index 7328a1982..d64588a55 100644 --- a/src/main/java/gov/nasa/pds/validate/ri/AuthInformation.java +++ b/src/main/java/gov/nasa/pds/validate/ri/AuthInformation.java @@ -51,7 +51,7 @@ public static AuthInformation buildFrom(String filename) // Determine which file processing to use if (line.startsWith("")) { // XML // - DocumentBuilder builder = DocumentBuilderFactory.newDefaultInstance().newDocumentBuilder(); + DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); Document document = builder.parse(file); NodeList registries = document.getElementsByTagName("registry"); From a42e3a3da06598a4570f32c7611369e23681e351 Mon Sep 17 00:00:00 2001 From: Al Niessner Date: Thu, 22 Feb 2024 16:03:29 -0800 Subject: [PATCH 3/3] put this back in from #734 --- .../gov/nasa/pds/tools/validate/rule/RegisterTargets.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/gov/nasa/pds/tools/validate/rule/RegisterTargets.java b/src/main/java/gov/nasa/pds/tools/validate/rule/RegisterTargets.java index d819e3df2..9885732ec 100644 --- a/src/main/java/gov/nasa/pds/tools/validate/rule/RegisterTargets.java +++ b/src/main/java/gov/nasa/pds/tools/validate/rule/RegisterTargets.java @@ -14,6 +14,7 @@ package gov.nasa.pds.tools.validate.rule; import java.net.URISyntaxException; +import java.util.Arrays; import gov.nasa.pds.tools.util.Utility; import gov.nasa.pds.tools.validate.Target; import gov.nasa.pds.tools.validate.TargetRegistrar; @@ -48,6 +49,9 @@ public void registerTargets() { try { Crawler crawler = getContext().getCrawler(); WildcardOSFilter fileFilter = getContext().getFileFilters(); + if (!"PDS4 Directory".equalsIgnoreCase(getContext().getRule().getCaption())) { + fileFilter = new WildcardOSFilter(Arrays.asList(new String[] {"*"})); + } for (Target child : crawler.crawl(getTarget(), getContext().isRecursive(), fileFilter)) { try { String childLocation = child.getUrl().toURI().normalize().toString();