Skip to content

Commit db0f655

Browse files
bourgeslbourgesl
committed
simplified MJD filter to act as std column
1 parent 8cc05b5 commit db0f655

31 files changed

Lines changed: 93 additions & 683 deletions

‎rules/DataModelV1-all.xml‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -2509,36 +2509,6 @@
25092509
<repeat>1</repeat>
25102510
<array>false</array>
25112511
</column>
2512-
<column>
2513-
<name>MJD_START</name>
2514-
<datatype>TYPE_DBL</datatype>
2515-
<description>Modified Julian Day (start date of observation)</description>
2516-
<optional>false</optional>
2517-
<unit>UNIT_DAYS</unit>
2518-
<rules>
2519-
</rules>
2520-
<repeat>1</repeat>
2521-
<array>false</array>
2522-
<datarange>
2523-
<name>RANGE_POSITIVE_STRICT</name>
2524-
<min>0.0</min>
2525-
</datarange>
2526-
</column>
2527-
<column>
2528-
<name>MJD_END</name>
2529-
<datatype>TYPE_DBL</datatype>
2530-
<description>Modified Julian Day (end date of observation)</description>
2531-
<optional>false</optional>
2532-
<unit>UNIT_DAYS</unit>
2533-
<rules>
2534-
</rules>
2535-
<repeat>1</repeat>
2536-
<array>false</array>
2537-
<datarange>
2538-
<name>RANGE_POSITIVE_STRICT</name>
2539-
<min>0.0</min>
2540-
</datarange>
2541-
</column>
25422512
<column>
25432513
<name>STA_CONF</name>
25442514
<datatype>TYPE_SHORT</datatype>
@@ -3089,36 +3059,6 @@
30893059
<repeat>1</repeat>
30903060
<array>false</array>
30913061
</column>
3092-
<column>
3093-
<name>MJD_START</name>
3094-
<datatype>TYPE_DBL</datatype>
3095-
<description>Modified Julian Day (start date of observation)</description>
3096-
<optional>false</optional>
3097-
<unit>UNIT_DAYS</unit>
3098-
<rules>
3099-
</rules>
3100-
<repeat>1</repeat>
3101-
<array>false</array>
3102-
<datarange>
3103-
<name>RANGE_POSITIVE_STRICT</name>
3104-
<min>0.0</min>
3105-
</datarange>
3106-
</column>
3107-
<column>
3108-
<name>MJD_END</name>
3109-
<datatype>TYPE_DBL</datatype>
3110-
<description>Modified Julian Day (end date of observation)</description>
3111-
<optional>false</optional>
3112-
<unit>UNIT_DAYS</unit>
3113-
<rules>
3114-
</rules>
3115-
<repeat>1</repeat>
3116-
<array>false</array>
3117-
<datarange>
3118-
<name>RANGE_POSITIVE_STRICT</name>
3119-
<min>0.0</min>
3120-
</datarange>
3121-
</column>
31223062
<column>
31233063
<name>STA_CONF</name>
31243064
<datatype>TYPE_SHORT</datatype>
@@ -3688,36 +3628,6 @@
36883628
<repeat>1</repeat>
36893629
<array>false</array>
36903630
</column>
3691-
<column>
3692-
<name>MJD_START</name>
3693-
<datatype>TYPE_DBL</datatype>
3694-
<description>Modified Julian Day (start date of observation)</description>
3695-
<optional>false</optional>
3696-
<unit>UNIT_DAYS</unit>
3697-
<rules>
3698-
</rules>
3699-
<repeat>1</repeat>
3700-
<array>false</array>
3701-
<datarange>
3702-
<name>RANGE_POSITIVE_STRICT</name>
3703-
<min>0.0</min>
3704-
</datarange>
3705-
</column>
3706-
<column>
3707-
<name>MJD_END</name>
3708-
<datatype>TYPE_DBL</datatype>
3709-
<description>Modified Julian Day (end date of observation)</description>
3710-
<optional>false</optional>
3711-
<unit>UNIT_DAYS</unit>
3712-
<rules>
3713-
</rules>
3714-
<repeat>1</repeat>
3715-
<array>false</array>
3716-
<datarange>
3717-
<name>RANGE_POSITIVE_STRICT</name>
3718-
<min>0.0</min>
3719-
</datarange>
3720-
</column>
37213631
<column>
37223632
<name>STA_CONF</name>
37233633
<datatype>TYPE_SHORT</datatype>

‎rules/DataModelV1-all_output.html‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎rules/DataModelV2-all.xml‎

Lines changed: 0 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -3635,36 +3635,6 @@
36353635
<repeat>1</repeat>
36363636
<array>false</array>
36373637
</column>
3638-
<column>
3639-
<name>MJD_START</name>
3640-
<datatype>TYPE_DBL</datatype>
3641-
<description>Modified Julian Day (start date of observation)</description>
3642-
<optional>false</optional>
3643-
<unit>UNIT_DAYS</unit>
3644-
<rules>
3645-
</rules>
3646-
<repeat>1</repeat>
3647-
<array>false</array>
3648-
<datarange>
3649-
<name>RANGE_POSITIVE_STRICT</name>
3650-
<min>0.0</min>
3651-
</datarange>
3652-
</column>
3653-
<column>
3654-
<name>MJD_END</name>
3655-
<datatype>TYPE_DBL</datatype>
3656-
<description>Modified Julian Day (end date of observation)</description>
3657-
<optional>false</optional>
3658-
<unit>UNIT_DAYS</unit>
3659-
<rules>
3660-
</rules>
3661-
<repeat>1</repeat>
3662-
<array>false</array>
3663-
<datarange>
3664-
<name>RANGE_POSITIVE_STRICT</name>
3665-
<min>0.0</min>
3666-
</datarange>
3667-
</column>
36683638
<column>
36693639
<name>STA_CONF</name>
36703640
<datatype>TYPE_SHORT</datatype>
@@ -4435,36 +4405,6 @@
44354405
<repeat>1</repeat>
44364406
<array>false</array>
44374407
</column>
4438-
<column>
4439-
<name>MJD_START</name>
4440-
<datatype>TYPE_DBL</datatype>
4441-
<description>Modified Julian Day (start date of observation)</description>
4442-
<optional>false</optional>
4443-
<unit>UNIT_DAYS</unit>
4444-
<rules>
4445-
</rules>
4446-
<repeat>1</repeat>
4447-
<array>false</array>
4448-
<datarange>
4449-
<name>RANGE_POSITIVE_STRICT</name>
4450-
<min>0.0</min>
4451-
</datarange>
4452-
</column>
4453-
<column>
4454-
<name>MJD_END</name>
4455-
<datatype>TYPE_DBL</datatype>
4456-
<description>Modified Julian Day (end date of observation)</description>
4457-
<optional>false</optional>
4458-
<unit>UNIT_DAYS</unit>
4459-
<rules>
4460-
</rules>
4461-
<repeat>1</repeat>
4462-
<array>false</array>
4463-
<datarange>
4464-
<name>RANGE_POSITIVE_STRICT</name>
4465-
<min>0.0</min>
4466-
</datarange>
4467-
</column>
44684408
<column>
44694409
<name>STA_CONF</name>
44704410
<datatype>TYPE_SHORT</datatype>
@@ -5088,36 +5028,6 @@
50885028
<repeat>1</repeat>
50895029
<array>false</array>
50905030
</column>
5091-
<column>
5092-
<name>MJD_START</name>
5093-
<datatype>TYPE_DBL</datatype>
5094-
<description>Modified Julian Day (start date of observation)</description>
5095-
<optional>false</optional>
5096-
<unit>UNIT_DAYS</unit>
5097-
<rules>
5098-
</rules>
5099-
<repeat>1</repeat>
5100-
<array>false</array>
5101-
<datarange>
5102-
<name>RANGE_POSITIVE_STRICT</name>
5103-
<min>0.0</min>
5104-
</datarange>
5105-
</column>
5106-
<column>
5107-
<name>MJD_END</name>
5108-
<datatype>TYPE_DBL</datatype>
5109-
<description>Modified Julian Day (end date of observation)</description>
5110-
<optional>false</optional>
5111-
<unit>UNIT_DAYS</unit>
5112-
<rules>
5113-
</rules>
5114-
<repeat>1</repeat>
5115-
<array>false</array>
5116-
<datarange>
5117-
<name>RANGE_POSITIVE_STRICT</name>
5118-
<min>0.0</min>
5119-
</datarange>
5120-
</column>
51215031
<column>
51225032
<name>STA_CONF</name>
51235033
<datatype>TYPE_SHORT</datatype>
@@ -5560,36 +5470,6 @@
55605470
<repeat>1</repeat>
55615471
<array>false</array>
55625472
</column>
5563-
<column>
5564-
<name>MJD_START</name>
5565-
<datatype>TYPE_DBL</datatype>
5566-
<description>Modified Julian Day (start date of observation)</description>
5567-
<optional>false</optional>
5568-
<unit>UNIT_DAYS</unit>
5569-
<rules>
5570-
</rules>
5571-
<repeat>1</repeat>
5572-
<array>false</array>
5573-
<datarange>
5574-
<name>RANGE_POSITIVE_STRICT</name>
5575-
<min>0.0</min>
5576-
</datarange>
5577-
</column>
5578-
<column>
5579-
<name>MJD_END</name>
5580-
<datatype>TYPE_DBL</datatype>
5581-
<description>Modified Julian Day (end date of observation)</description>
5582-
<optional>false</optional>
5583-
<unit>UNIT_DAYS</unit>
5584-
<rules>
5585-
</rules>
5586-
<repeat>1</repeat>
5587-
<array>false</array>
5588-
<datarange>
5589-
<name>RANGE_POSITIVE_STRICT</name>
5590-
<min>0.0</min>
5591-
</datarange>
5592-
</column>
55935473
<column>
55945474
<name>STA_CONF</name>
55955475
<datatype>TYPE_SHORT</datatype>

‎rules/DataModelV2-all_output.html‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/main/java/fr/jmmc/oitools/OIFitsCollectionViewer.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ public static void baselinesPerGranule(final OIFitsCollection oiFitsCollection,
195195
final List<Granule> granules = oiFitsCollection.getSortedGranules();
196196

197197
final List<String> sortedStaNames = new ArrayList<String>(16);
198-
final List<Range> sortedMJDRanges = new ArrayList<Range>(16);
199198

200199
for (Granule granule : granules) {
201200
final Target gTarget = granule.getTarget();
@@ -218,10 +217,8 @@ public static void baselinesPerGranule(final OIFitsCollection oiFitsCollection,
218217
sortedStaNames.addAll(granule.getDistinctStaNames());
219218
Collections.sort(sortedStaNames, StationNamesComparator.INSTANCE);
220219

221-
// Sort MJD Ranges:
222-
sortedMJDRanges.clear();
223-
sortedMJDRanges.addAll(granule.getDistinctMjdRanges());
224-
Collections.sort(sortedMJDRanges);
220+
// MJD Range:
221+
final Range mjdRange = granule.getMjdRange();
225222

226223
out.append(insName).append(SEP)
227224
.append(minWavelength).append(SEP)
@@ -231,11 +228,9 @@ public static void baselinesPerGranule(final OIFitsCollection oiFitsCollection,
231228
.append(targetRa).append(SEP)
232229
.append(targetDec).append(SEP);
233230

234-
// distinct MJD ranges:
235-
for (Range r : sortedMJDRanges) {
236-
out.append('[').append(df6.format(r.getMin())).append(',').append(df6.format(r.getMax())).append("] ");
237-
}
238-
out.append(SEP);
231+
// MJD range:
232+
out.append('[').append(df6.format(mjdRange.getMin())).append(',')
233+
.append(df6.format(mjdRange.getMax())).append("] ").append(SEP);
239234

240235
// distinct StaNames:
241236
for (String staName : sortedStaNames) {

‎src/main/java/fr/jmmc/oitools/OIFitsConstants.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,6 @@ NS_MODEL_T3PHIERR D(NWAVE) Model of the error in triple-product phase in degrees
422422
public final static String COLUMN_SPATIAL_FREQ = "SPATIAL_FREQ";
423423
/** NIGHT_ID derived OiData column as double[] */
424424
public final static String COLUMN_NIGHT_ID = "NIGHT_ID";
425-
/** MJD_START derived OiData column as double[] */
426-
public final static String COLUMN_MJD_START_R = "MJD_START";
427-
/** MJD_END derived OiData column as double[] */
428-
public final static String COLUMN_MJD_END_R = "MJD_END";
429425
/** UCOORD_SPATIAL derived OIData column as double[][] */
430426
public final static String COLUMN_UCOORD_SPATIAL = "UCOORD_SPATIAL";
431427
/** VCOORD_SPATIAL derived OIData column as double[][] */

‎src/main/java/fr/jmmc/oitools/model/Analyzer.java‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,8 @@ private void process(final OIData oiData) {
182182
final int[] nightIds = oiData.getNightId();
183183
// StaIndex column:
184184
final short[][] staIndexes = oiData.getStaIndex();
185-
// Get MJDStart column:
186-
final double[] mjdStart = oiData.getMJDStart();
187-
// Get MJDStart column:
188-
final double[] mjdEnd = oiData.getMJDEnd();
185+
// Get MJD column:
186+
final double[] mjds = oiData.getMJD();
189187

190188
// note: if no OITarget table then the target will be Target.UNDEFINED
191189
final Map<Short, Target> targetIdToTarget = (oiTarget != null) ? oiTarget.getTargetIdToTarget() : null;
@@ -199,8 +197,6 @@ private void process(final OIData oiData) {
199197
final Set<Short> distinctTargetId = oiData.getDistinctTargetId();
200198
// Fill distinct Night Id:
201199
final Set<NightId> distinctNightId = oiData.getDistinctNightId();
202-
// Fill distinct MJD ranges:
203-
final Map<Range, Range> distinctMjdRanges = oiData.getDistinctMJDRanges();
204200
// Fill distinct Granule:
205201
final Map<Granule, Granule> distinctGranules = oiData.getOIFitsFile().getDistinctGranules();
206202
// Fill oidata tables per (distinct) Granule:
@@ -211,9 +207,6 @@ private void process(final OIData oiData) {
211207
// reused NightId:
212208
NightId n = new NightId();
213209

214-
// reused Range:
215-
Range r = new Range();
216-
217210
// reused Granule:
218211
Granule g = new Granule();
219212

@@ -239,16 +232,6 @@ private void process(final OIData oiData) {
239232
}
240233
distinctNightId.add(night);
241234

242-
// Get MJD Range:
243-
r.set(mjdStart[i], mjdEnd[i]);
244-
245-
Range mjdRange = distinctMjdRanges.get(r);
246-
if (mjdRange == null) {
247-
distinctMjdRanges.put(r, r);
248-
mjdRange = r;
249-
r = new Range();
250-
}
251-
252235
// Get corresponding StaName:
253236
String staNames = null;
254237
if (staIndexes != null) {
@@ -269,6 +252,9 @@ private void process(final OIData oiData) {
269252
}
270253
}
271254

255+
// Get MJD value:
256+
final double mjd = mjds[i];
257+
272258
// Update / Resolve Granule:
273259
g.set(target, insMode, night);
274260

@@ -279,14 +265,14 @@ private void process(final OIData oiData) {
279265
g = new Granule();
280266
}
281267

282-
// Update distinct MJD Ranges on shared granule:
283-
granule.getDistinctMjdRanges().add(mjdRange);
284-
285268
// Update distinct StaNames on shared granule:
286269
if (staNames != null) {
287270
granule.getDistinctStaNames().add(staNames);
288271
}
289272

273+
// Update MJD Ranges on shared granule:
274+
granule.updateMjdRange(mjd);
275+
290276
// Lookup pre-existing Granule (same granule fields):
291277
Set<OIData> oiDataTables = oiDataPerGranule.get(granule);
292278
if (oiDataTables == null) {
@@ -303,7 +289,6 @@ private void process(final OIData oiData) {
303289
logger.log(Level.FINE, "process: OIData[{0}] nFlagged: {1}", new Object[]{oiData, nFlagged});
304290
logger.log(Level.FINE, "process: OIData[{0}] distinctTargetId {1}", new Object[]{oiData, distinctTargetId});
305291
logger.log(Level.FINE, "process: OIData[{0}] distinctNightId {1}", new Object[]{oiData, distinctNightId});
306-
logger.log(Level.FINE, "process: OIData[{0}] distinctMjdRanges {1}", new Object[]{oiData, distinctMjdRanges});
307292
}
308293
}
309294

0 commit comments

Comments
 (0)