Skip to content

Commit 3c198c2

Browse files
TomBlockTomBlock
committed
changed test-file
1 parent b9a44b7 commit 3c198c2

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ public class MatchupToolIntegrationTest_AVHRR_SLSTR extends AbstractUsecaseInteg
4949
@Test
5050
public void testMatchup_AVHRR_SLSTR_UOR() throws IOException, ParseException, SQLException, InvalidRangeException {
5151
final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder()
52-
.withTimeDeltaSeconds(60000, null)
53-
.withMaxPixelDistanceKm(0.1f, null)
52+
.withTimeDeltaSeconds(7200, null)
53+
.withMaxPixelDistanceKm(0.025f, null)
54+
.withOverlapRemoval("SECONDARY")
55+
.withPixelPosition("SECONDARY", 568, 1467, -1, -1)
5456
.createConfig();
5557
final File useCaseConfigFile = storeUseCaseConfig(useCaseConfig, "usecase-avhrr-slstr.xml");
5658

57-
insert_AVHRR_FRAC_MA();
59+
insert_AVHRR_FRAC_MC();
5860
insert_SLSTR_UOR();
5961

6062
final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-u", useCaseConfigFile.getName(), "-start", "2020-142", "-end", "2020-143"};
@@ -65,28 +67,28 @@ public void testMatchup_AVHRR_SLSTR_UOR() throws IOException, ParseException, SQ
6567

6668
try (NetcdfFile mmd = NetcdfFile.open(mmdFile.getAbsolutePath())) {
6769
final int matchupCount = NetCDFUtils.getDimensionLength(FiduceoConstants.MATCHUP_COUNT, mmd);
68-
assertEquals(1380, matchupCount);
70+
assertEquals(1641, matchupCount);
6971

7072
NCTestUtils.assert3DVariable("slstr-s3a-uor_S1_radiance_in", 0, 0, 0, -32768, mmd);
71-
NCTestUtils.assert3DVariable("slstr-s3a-uor_S7_BT_in", 1, 0, 24, 854, mmd);
72-
NCTestUtils.assert3DVariable("slstr-s3a-uor_acquisition_time", 2, 0, 25, 1590189249, mmd);
73-
NCTestUtils.assert3DVariable("slstr-s3a-uor_S8_exception_in", 0, 1, 30, 2, mmd);
74-
NCTestUtils.assert3DVariable("slstr-s3a-uor_cloud_io", 1, 1, 31, 32769, mmd);
75-
NCTestUtils.assert3DVariable("slstr-s3a-uor_detector_io", 2, 1, 32, 255, mmd);
76-
NCTestUtils.assert3DVariable("slstr-s3a-uor_latitude_in", 0, 2, 33, -19847056, mmd);
77-
NCTestUtils.assert3DVariable("slstr-s3a-uor_longitude_in", 1, 2, 34, -5812828, mmd);
78-
NCTestUtils.assert3DVariable("slstr-s3a-uor_solar_azimuth_tn", 2, 2, 35, 275.6034547080558, mmd);
79-
NCTestUtils.assert3DVariable("slstr-s3a-uor_solar_azimuth_to", 0, 0, 36, Float.NaN, mmd);
80-
81-
NCTestUtils.assert3DVariable("avhrr-frac-mc_acquisition_time", 0, 0, 1, 1590137472, mmd);
73+
NCTestUtils.assert3DVariable("slstr-s3a-uor_S7_BT_in", 1, 0, 24, -641, mmd);
74+
NCTestUtils.assert3DVariable("slstr-s3a-uor_acquisition_time", 2, 0, 25, 1590189143, mmd);
75+
NCTestUtils.assert3DVariable("slstr-s3a-uor_S8_exception_in", 0, 1, 30, 0, mmd);
76+
NCTestUtils.assert3DVariable("slstr-s3a-uor_cloud_io", 1, 1, 31, 1024, mmd);
77+
NCTestUtils.assert3DVariable("slstr-s3a-uor_detector_io", 2, 1, 32, 0, mmd);
78+
NCTestUtils.assert3DVariable("slstr-s3a-uor_latitude_in", 0, 2, 33, -28294595, mmd);
79+
NCTestUtils.assert3DVariable("slstr-s3a-uor_longitude_in", 1, 2, 34, -15396355, mmd);
80+
NCTestUtils.assert3DVariable("slstr-s3a-uor_solar_azimuth_tn", 2, 2, 35, 255.55368047574404, mmd);
81+
NCTestUtils.assert3DVariable("slstr-s3a-uor_solar_azimuth_to", 0, 0, 36, 255.10406145929286, mmd);
82+
83+
NCTestUtils.assert3DVariable("avhrr-frac-mc_acquisition_time", 0, 0, 1, 1590186057, mmd);
8284
NCTestUtils.assert3DVariable("avhrr-frac-mc_cloudFlag", 1, 0, 2, 0, mmd);
83-
NCTestUtils.assert3DVariable("avhrr-frac-mc_delta_azimuth", 2, 0, 3, 52.04375076293945, mmd);
84-
NCTestUtils.assert3DVariable("avhrr-frac-mc_flags", 0, 1, 4, -1, mmd);
85-
NCTestUtils.assert3DVariable("avhrr-frac-mc_latitude", 1, 1, 5, -19.104799270629883, mmd);
86-
NCTestUtils.assert3DVariable("avhrr-frac-mc_longitude", 2, 1, 6, -5.870356559753418, mmd);
87-
NCTestUtils.assert3DVariable("avhrr-frac-mc_radiance_1", 0, 2, 7, 87.23554992675781, mmd);
88-
NCTestUtils.assert3DVariable("avhrr-frac-mc_radiance_2", 1, 2, 8, 64.54716491699219, mmd);
89-
NCTestUtils.assert3DVariable("avhrr-frac-mc_radiance_3a", 2, 2, 9, 11.970253944396973, mmd);
85+
NCTestUtils.assert3DVariable("avhrr-frac-mc_delta_azimuth", 2, 0, 3, -5.319550037384033, mmd);
86+
NCTestUtils.assert3DVariable("avhrr-frac-mc_flags", 0, 1, 4, 0, mmd);
87+
NCTestUtils.assert3DVariable("avhrr-frac-mc_latitude", 1, 1, 5, -28.55242347717285, mmd);
88+
NCTestUtils.assert3DVariable("avhrr-frac-mc_longitude", 2, 1, 6, -11.668692588806152, mmd);
89+
NCTestUtils.assert3DVariable("avhrr-frac-mc_radiance_1", 0, 2, 7, -0.10571436583995819, mmd);
90+
NCTestUtils.assert3DVariable("avhrr-frac-mc_radiance_2", 1, 2, 8, 0.009339322336018085, mmd);
91+
NCTestUtils.assert3DVariable("avhrr-frac-mc_radiance_3a", 2, 2, 9, 0.0, mmd);
9092
}
9193
}
9294

@@ -98,9 +100,9 @@ private void insert_SLSTR_UOR() throws IOException, SQLException {
98100
storage.insert(satelliteObservation);
99101
}
100102

101-
private void insert_AVHRR_FRAC_MA() throws IOException, SQLException {
103+
private void insert_AVHRR_FRAC_MC() throws IOException, SQLException {
102104
final String sensorKey = "avhrr-frac-mc";
103-
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{sensorKey, "v1", "2020", "05", "22", "NSS.FRAC.M3.D20143.S0824.E1005.B0798990.SV"}, true);
105+
final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{sensorKey, "v1", "2020", "05", "22", "NSS.FRAC.M3.D20143.S2148.E2331.B0799798.SV"}, true);
104106

105107
final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v1");
106108
storage.insert(satelliteObservation);

0 commit comments

Comments
 (0)