Skip to content

Commit 47f166d

Browse files
BeLu-23BeLu-23
committed
Merge branch 'master' of github.com:bcdev/MMS into BL_GenericCsvReader_gbov_ndbc
2 parents 0656b78 + 9692be7 commit 47f166d

File tree

9 files changed

+34
-34
lines changed

9 files changed

+34
-34
lines changed

‎core/src/main/java/com/bc/fiduceo/reader/amsu_mhs/AMSUA_L1B_ReaderPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class AMSUA_L1B_ReaderPlugin implements ReaderPlugin {
99

10-
private static final String[] SENSOR_KEYS = {"amsua-ma", "amsua-mb", "amsua-mc"};
10+
private static final String[] SENSOR_KEYS = {"amsua-ma-l1b", "amsua-mb-l1b", "amsua-mc-l1b"};
1111

1212
@Override
1313
public Reader createReader(ReaderContext readerContext) {

‎core/src/main/java/com/bc/fiduceo/reader/amsu_mhs/MHS_L1B_ReaderPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class MHS_L1B_ReaderPlugin implements ReaderPlugin {
99

10-
private static final String[] SENSOR_KEYS = {"mhs-ma", "mhs-mb", "mhs-mc"};
10+
private static final String[] SENSOR_KEYS = {"mhs-ma-l1b", "mhs-mb-l1b", "mhs-mc-l1b"};
1111

1212
@Override
1313
public Reader createReader(ReaderContext readerContext) {

‎core/src/test/java/com/bc/fiduceo/reader/amsu_mhs/AMSUA_L1B_ReaderPluginTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void setUp() {
2020

2121
@Test
2222
public void testGetSupportedSensorKeys() {
23-
final String[] expected = {"amsua-ma", "amsua-mb", "amsua-mc"};
23+
final String[] expected = {"amsua-ma-l1b", "amsua-mb-l1b", "amsua-mc-l1b"};
2424

2525
final String[] sensorKeys = plugin.getSupportedSensorKeys();
2626
assertArrayEquals(expected, sensorKeys);

‎core/src/test/java/com/bc/fiduceo/reader/amsu_mhs/AMSUA_L1B_Reader_IO_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ public void testReadAcquisitionTime() throws InvalidRangeException, IOException
472472
}
473473
}
474474
private File createAmsuaMetopAPath(String fileName) throws IOException {
475-
final String testFilePath = TestUtil.assembleFileSystemPath(new String[]{"amsua-ma", "v8A", "2016", "01", "01", fileName}, false);
475+
final String testFilePath = TestUtil.assembleFileSystemPath(new String[]{"amsua-ma-l1b", "v8A", "2016", "01", "01", fileName}, false);
476476
return TestUtil.getTestDataFileAsserted(testFilePath);
477477
}
478478
}

‎core/src/test/java/com/bc/fiduceo/reader/amsu_mhs/MHS_L1B_ReaderPluginTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void setUp() throws Exception {
2020

2121
@Test
2222
public void testGetSupportedSensorKeys() {
23-
final String[] expected = {"mhs-ma", "mhs-mb", "mhs-mc"};
23+
final String[] expected = {"mhs-ma-l1b", "mhs-mb-l1b", "mhs-mc-l1b"};
2424

2525
final String[] sensorKeys = plugin.getSupportedSensorKeys();
2626
assertArrayEquals(expected, sensorKeys);

‎core/src/test/java/com/bc/fiduceo/reader/amsu_mhs/MHS_L1B_Reader_IO_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ public void getReadAcquisitionTime() throws InvalidRangeException, IOException {
512512
}
513513

514514
private File createMhsMetopCPath(String fileName) throws IOException {
515-
final String testFilePath = TestUtil.assembleFileSystemPath(new String[]{"mhs-mc", "v10", "2025", "08", "20", fileName}, false);
515+
final String testFilePath = TestUtil.assembleFileSystemPath(new String[]{"mhs-mc-l1b", "v10", "2025", "08", "20", fileName}, false);
516516
return TestUtil.getTestDataFileAsserted(testFilePath);
517517
}
518518
}

‎ingestion-tool/src/test/java/com/bc/fiduceo/ingest/IngestionToolIntegrationTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ public void testIngest_MHS_NOAA18() throws SQLException, ParseException {
385385

386386
@Test
387387
public void testIngest_MHS_L1B_MC() throws SQLException, ParseException {
388-
final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-s", "mhs-mc", "-start", "2025-232", "-end", "2025-232", "-v", "v10"};
388+
final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-s", "mhs-mc-l1b", "-start", "2025-232", "-end", "2025-232", "-v", "v10"};
389389

390390
IngestionToolMain.main(args);
391391
final List<SatelliteObservation> satelliteObservations = storage.get();
@@ -394,9 +394,9 @@ public void testIngest_MHS_L1B_MC() throws SQLException, ParseException {
394394
final SatelliteObservation observation = getSatelliteObservation("MHSx_xxx_1B_M03_20250820060350Z_20250820074550Z_N_O_20250820074043Z.nat", satelliteObservations);
395395
TestUtil.assertCorrectUTCDate(2025, 8, 20, 6, 3, 50, 0, observation.getStartTime());
396396
TestUtil.assertCorrectUTCDate(2025, 8, 20, 7, 45, 50, 0, observation.getStopTime());
397-
assertEquals("mhs-mc", observation.getSensor().getName());
397+
assertEquals("mhs-mc-l1b", observation.getSensor().getName());
398398

399-
final String expectedPath = TestUtil.assembleFileSystemPath(new String[]{"mhs-mc", "v10", "2025", "08", "20", "MHSx_xxx_1B_M03_20250820060350Z_20250820074550Z_N_O_20250820074043Z.nat"}, false);
399+
final String expectedPath = TestUtil.assembleFileSystemPath(new String[]{"mhs-mc-l1b", "v10", "2025", "08", "20", "MHSx_xxx_1B_M03_20250820060350Z_20250820074550Z_N_O_20250820074043Z.nat"}, false);
400400
assertEquals(expectedPath, observation.getDataFilePath().toString());
401401

402402
assertEquals(NodeType.UNDEFINED, observation.getNodeType());

‎matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest_AMSUA_point.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ public void testMatchup_AMSUA_location_extracts() throws IOException, ParseExcep
7070
final int matchupCount = NetCDFUtils.getDimensionLength(FiduceoConstants.MATCHUP_COUNT, mmd);
7171
assertEquals(1, matchupCount);
7272

73-
NCTestUtils.assert3DVariable("amsua-ma_SCENE_RADIANCE_01", 0, 0, 0, 10912, mmd);
74-
NCTestUtils.assert3DVariable("amsua-ma_SCENE_RADIANCE_07", 1, 0, 0, 61606, mmd);
75-
NCTestUtils.assert3DVariable("amsua-ma_SCENE_RADIANCE_14", 2, 0, 0, 74835, mmd);
76-
NCTestUtils.assert3DVariable("amsua-ma_SURFACE_PROPERTIES", 0, 1, 0, 0, mmd);
77-
NCTestUtils.assert3DVariable("amsua-ma_acquisition_time", 1, 1, 0, 1451693029, mmd);
78-
NCTestUtils.assert3DVariable("amsua-ma_longitude", 2, 1, 0, 1494646, mmd);
79-
NCTestUtils.assert3DVariable("amsua-ma_satellite_zenith_angle", 0, 2, 0, 4035, mmd);
73+
NCTestUtils.assert3DVariable("amsua-ma-l1b_SCENE_RADIANCE_01", 0, 0, 0, 10912, mmd);
74+
NCTestUtils.assert3DVariable("amsua-ma-l1b_SCENE_RADIANCE_07", 1, 0, 0, 61606, mmd);
75+
NCTestUtils.assert3DVariable("amsua-ma-l1b_SCENE_RADIANCE_14", 2, 0, 0, 74835, mmd);
76+
NCTestUtils.assert3DVariable("amsua-ma-l1b_SURFACE_PROPERTIES", 0, 1, 0, 0, mmd);
77+
NCTestUtils.assert3DVariable("amsua-ma-l1b_acquisition_time", 1, 1, 0, 1451693029, mmd);
78+
NCTestUtils.assert3DVariable("amsua-ma-l1b_longitude", 2, 1, 0, 1494646, mmd);
79+
NCTestUtils.assert3DVariable("amsua-ma-l1b_satellite_zenith_angle", 0, 2, 0, 4035, mmd);
8080
}
8181
}
8282

8383
private void insert_AMSUA() throws IOException, SQLException {
84-
final String sensorKey = "amsua-ma";
84+
final String sensorKey = "amsua-ma-l1b";
8585
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{sensorKey, "v8A", "2016", "01", "01", "AMSA_xxx_1B_M01_20160101234924Z_20160102013124Z_N_O_20160102003323Z.nat"}, true);
8686

8787
final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v8A");
@@ -90,16 +90,16 @@ private void insert_AMSUA() throws IOException, SQLException {
9090

9191
private MatchupToolTestUseCaseConfigBuilder createUseCaseConfigBuilder() {
9292
final List<Sensor> sensorList = new ArrayList<>();
93-
final Sensor primary = new Sensor("amsua-ma");
93+
final Sensor primary = new Sensor("amsua-ma-l1b");
9494
primary.setPrimary(true);
9595
sensorList.add(primary);
9696

9797
final List<com.bc.fiduceo.core.Dimension> dimensions = new ArrayList<>();
98-
dimensions.add(new com.bc.fiduceo.core.Dimension("amsua-ma", 3, 3));
98+
dimensions.add(new com.bc.fiduceo.core.Dimension("amsua-ma-l1b", 3, 3));
9999

100-
return (MatchupToolTestUseCaseConfigBuilder) new MatchupToolTestUseCaseConfigBuilder("amsua-ma")
100+
return (MatchupToolTestUseCaseConfigBuilder) new MatchupToolTestUseCaseConfigBuilder("amsua-ma-l1b")
101101
.withSensors(sensorList)
102-
.withOutputPath(new File(TestUtil.getTestDir().getPath(), "amsua-ma").getPath())
102+
.withOutputPath(new File(TestUtil.getTestDir().getPath(), "amsua-ma-l1b").getPath())
103103
.withDimensions(dimensions);
104104
}
105105
}

‎matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest_MHS_point.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ public void testMatchup_MHS_location_extracts() throws IOException, SQLException
5050
final int matchupCount = NetCDFUtils.getDimensionLength(FiduceoConstants.MATCHUP_COUNT, mmd);
5151
assertEquals(1, matchupCount);
5252

53-
NCTestUtils.assert3DVariable("mhs-mc_FOV_DATA_QUALITY", 0, 0, 0, 0, mmd);
54-
NCTestUtils.assert3DVariable("mhs-mc_SCENE_RADIANCES_03", 1, 0, 0, 732588, mmd);
55-
NCTestUtils.assert3DVariable("mhs-mc_SCENE_RADIANCES_05", 2, 0, 0, 868447, mmd);
56-
NCTestUtils.assert3DVariable("mhs-mc_SURFACE_PROPERTIES", 0, 1, 0, 2, mmd);
57-
NCTestUtils.assert3DVariable("mhs-mc_acquisition_time", 1, 1, 0, 1755669867, mmd);
58-
NCTestUtils.assert3DVariable("mhs-mc_longitude", 2, 1, 0, 491101, mmd);
59-
NCTestUtils.assert3DVariable("mhs-mc_satellite_zenith_angle", 0, 2, 0, 5302, mmd);
60-
NCTestUtils.assert3DVariable("mhs-mc_TERRAIN_ELEVATION", 0, 2, 0, 0, mmd);
53+
NCTestUtils.assert3DVariable("mhs-mc-l1b_FOV_DATA_QUALITY", 0, 0, 0, 0, mmd);
54+
NCTestUtils.assert3DVariable("mhs-mc-l1b_SCENE_RADIANCES_03", 1, 0, 0, 732588, mmd);
55+
NCTestUtils.assert3DVariable("mhs-mc-l1b_SCENE_RADIANCES_05", 2, 0, 0, 868447, mmd);
56+
NCTestUtils.assert3DVariable("mhs-mc-l1b_SURFACE_PROPERTIES", 0, 1, 0, 2, mmd);
57+
NCTestUtils.assert3DVariable("mhs-mc-l1b_acquisition_time", 1, 1, 0, 1755669867, mmd);
58+
NCTestUtils.assert3DVariable("mhs-mc-l1b_longitude", 2, 1, 0, 491101, mmd);
59+
NCTestUtils.assert3DVariable("mhs-mc-l1b_satellite_zenith_angle", 0, 2, 0, 5302, mmd);
60+
NCTestUtils.assert3DVariable("mhs-mc-l1b_TERRAIN_ELEVATION", 0, 2, 0, 0, mmd);
6161
}
6262
}
6363

6464
private void insert_MHS() throws IOException, SQLException {
65-
final String sensorKey = "mhs-mc";
65+
final String sensorKey = "mhs-mc-l1b";
6666
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{sensorKey, "v10", "2025", "08", "20", "MHSx_xxx_1B_M03_20250820060350Z_20250820074550Z_N_O_20250820074043Z.nat"}, true);
6767

6868
final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v10");
@@ -71,16 +71,16 @@ private void insert_MHS() throws IOException, SQLException {
7171

7272
private MatchupToolTestUseCaseConfigBuilder createUseCaseConfigBuilder() {
7373
final List<Sensor> sensorList = new ArrayList<>();
74-
final Sensor primary = new Sensor("mhs-mc");
74+
final Sensor primary = new Sensor("mhs-mc-l1b");
7575
primary.setPrimary(true);
7676
sensorList.add(primary);
7777

7878
final List<com.bc.fiduceo.core.Dimension> dimensions = new ArrayList<>();
79-
dimensions.add(new com.bc.fiduceo.core.Dimension("mhs-mc", 3, 3));
79+
dimensions.add(new com.bc.fiduceo.core.Dimension("mhs-mc-l1b", 3, 3));
8080

81-
return (MatchupToolTestUseCaseConfigBuilder) new MatchupToolTestUseCaseConfigBuilder("mhs-mc")
81+
return (MatchupToolTestUseCaseConfigBuilder) new MatchupToolTestUseCaseConfigBuilder("mhs-mc-l1b")
8282
.withSensors(sensorList)
83-
.withOutputPath(new File(TestUtil.getTestDir().getPath(), "mhs-mc").getPath())
83+
.withOutputPath(new File(TestUtil.getTestDir().getPath(), "mhs-mc-l1b").getPath())
8484
.withDimensions(dimensions);
8585
}
8686
}

0 commit comments

Comments
 (0)