Skip to content

Commit be4701e

Browse files
bourgeslbourgesl
committed
fixed oifitsProcessor to use full jar
1 parent 466d3c5 commit be4701e

6 files changed

Lines changed: 34 additions & 1 deletion

File tree

‎oifitsProcessor.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
# ./oifitsProcessor.sh list /home/bourgesl/oidata/2007-06-29.fits
77
#
88

9-
java -cp ./target/oitools-TRUNK.jar fr.jmmc.oitools.OIFitsProcessor $*;
9+
java -cp ./target/oitools-TRUNK-jar-with-dependencies.jar fr.jmmc.oitools.OIFitsProcessor $*;
10+

‎pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3535
<name>OITools</name>
3636

3737
<properties>
38+
<!-- do make assembly and copy dependencies -->
39+
<assembly.skipAssembly>false</assembly.skipAssembly>
40+
<mdep.skip>false</mdep.skip>
41+
3842
<!-- OITools is an open source project ASAP -->
3943
<maven.javadoc.skip>false</maven.javadoc.skip>
4044
<source.skip>false</source.skip>

‎rules/DataModelV1-all.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2313,6 +2313,7 @@
23132313
</rules>
23142314
<repeat>[[NWAVE]]</repeat>
23152315
<array>true</array>
2316+
<datacolumn>VIS2DATA</datacolumn>
23162317
<datarange>
23172318
<name>RANGE_POSITIVE</name>
23182319
<min>0.0</min>
@@ -2786,6 +2787,7 @@
27862787
</rules>
27872788
<repeat>[[NWAVE]]</repeat>
27882789
<array>true</array>
2790+
<datacolumn>VISDATA</datacolumn>
27892791
</column>
27902792
<column>
27912793
<name>VISAMP</name>
@@ -2821,6 +2823,7 @@
28212823
</rules>
28222824
<repeat>[[NWAVE]]</repeat>
28232825
<array>true</array>
2826+
<datacolumn>VISAMP</datacolumn>
28242827
<datarange>
28252828
<name>RANGE_POSITIVE</name>
28262829
<min>0.0</min>
@@ -2862,6 +2865,7 @@
28622865
</rules>
28632866
<repeat>[[NWAVE]]</repeat>
28642867
<array>true</array>
2868+
<datacolumn>VISPHI</datacolumn>
28652869
<datarange>
28662870
<name>RANGE_POSITIVE</name>
28672871
<min>0.0</min>
@@ -3357,6 +3361,7 @@
33573361
</rules>
33583362
<repeat>[[NWAVE]]</repeat>
33593363
<array>true</array>
3364+
<datacolumn>T3AMP</datacolumn>
33603365
<datarange>
33613366
<name>RANGE_POSITIVE</name>
33623367
<min>0.0</min>
@@ -3398,6 +3403,7 @@
33983403
</rules>
33993404
<repeat>[[NWAVE]]</repeat>
34003405
<array>true</array>
3406+
<datacolumn>T3PHI</datacolumn>
34013407
<datarange>
34023408
<name>RANGE_POSITIVE</name>
34033409
<min>0.0</min>

‎rules/DataModelV1.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,6 +1909,7 @@
19091909
</rules>
19101910
<repeat>[[NWAVE]]</repeat>
19111911
<array>true</array>
1912+
<datacolumn>VIS2DATA</datacolumn>
19121913
<datarange>
19131914
<name>RANGE_POSITIVE</name>
19141915
<min>0.0</min>
@@ -2196,6 +2197,7 @@
21962197
</rules>
21972198
<repeat>[[NWAVE]]</repeat>
21982199
<array>true</array>
2200+
<datacolumn>VISAMP</datacolumn>
21992201
<datarange>
22002202
<name>RANGE_POSITIVE</name>
22012203
<min>0.0</min>
@@ -2237,6 +2239,7 @@
22372239
</rules>
22382240
<repeat>[[NWAVE]]</repeat>
22392241
<array>true</array>
2242+
<datacolumn>VISPHI</datacolumn>
22402243
<datarange>
22412244
<name>RANGE_POSITIVE</name>
22422245
<min>0.0</min>
@@ -2523,6 +2526,7 @@
25232526
</rules>
25242527
<repeat>[[NWAVE]]</repeat>
25252528
<array>true</array>
2529+
<datacolumn>T3AMP</datacolumn>
25262530
<datarange>
25272531
<name>RANGE_POSITIVE</name>
25282532
<min>0.0</min>
@@ -2564,6 +2568,7 @@
25642568
</rules>
25652569
<repeat>[[NWAVE]]</repeat>
25662570
<array>true</array>
2571+
<datacolumn>T3PHI</datacolumn>
25672572
<datarange>
25682573
<name>RANGE_POSITIVE</name>
25692574
<min>0.0</min>

‎rules/DataModelV2-all.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3420,6 +3420,7 @@
34203420
</rules>
34213421
<repeat>[[NWAVE]]</repeat>
34223422
<array>true</array>
3423+
<datacolumn>VIS2DATA</datacolumn>
34233424
<datarange>
34243425
<name>RANGE_POSITIVE</name>
34253426
<min>0.0</min>
@@ -3975,6 +3976,7 @@
39753976
</rules>
39763977
<repeat>[[NWAVE]]</repeat>
39773978
<array>true</array>
3979+
<datacolumn>VISDATA</datacolumn>
39783980
</column>
39793981
<column>
39803982
<name>VISAMP</name>
@@ -4010,6 +4012,7 @@
40104012
</rules>
40114013
<repeat>[[NWAVE]]</repeat>
40124014
<array>true</array>
4015+
<datacolumn>VISAMP</datacolumn>
40134016
<datarange>
40144017
<name>RANGE_POSITIVE</name>
40154018
<min>0.0</min>
@@ -4051,6 +4054,7 @@
40514054
</rules>
40524055
<repeat>[[NWAVE]]</repeat>
40534056
<array>true</array>
4057+
<datacolumn>VISPHI</datacolumn>
40544058
<datarange>
40554059
<name>RANGE_POSITIVE</name>
40564060
<min>0.0</min>
@@ -4240,6 +4244,7 @@
42404244
</rules>
42414245
<repeat>[[NWAVE]]</repeat>
42424246
<array>true</array>
4247+
<datacolumn>RVIS</datacolumn>
42434248
<datarange>
42444249
<name>RANGE_POSITIVE</name>
42454250
<min>0.0</min>
@@ -4274,6 +4279,7 @@
42744279
</rules>
42754280
<repeat>[[NWAVE]]</repeat>
42764281
<array>true</array>
4282+
<datacolumn>IVIS</datacolumn>
42774283
<datarange>
42784284
<name>RANGE_POSITIVE</name>
42794285
<min>0.0</min>
@@ -4719,6 +4725,7 @@
47194725
</rules>
47204726
<repeat>[[NWAVE]]</repeat>
47214727
<array>true</array>
4728+
<datacolumn>T3AMP</datacolumn>
47224729
<datarange>
47234730
<name>RANGE_POSITIVE</name>
47244731
<min>0.0</min>
@@ -4760,6 +4767,7 @@
47604767
</rules>
47614768
<repeat>[[NWAVE]]</repeat>
47624769
<array>true</array>
4770+
<datacolumn>T3PHI</datacolumn>
47634771
<datarange>
47644772
<name>RANGE_POSITIVE</name>
47654773
<min>0.0</min>
@@ -5383,6 +5391,7 @@
53835391
</rules>
53845392
<repeat>[[NWAVE]]</repeat>
53855393
<array>true</array>
5394+
<datacolumn>FLUXDATA</datacolumn>
53865395
<datarange>
53875396
<name>RANGE_POSITIVE</name>
53885397
<min>0.0</min>

‎rules/DataModelV2.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3350,6 +3350,7 @@
33503350
</rules>
33513351
<repeat>[[NWAVE]]</repeat>
33523352
<array>true</array>
3353+
<datacolumn>VIS2DATA</datacolumn>
33533354
<datarange>
33543355
<name>RANGE_POSITIVE</name>
33553356
<min>0.0</min>
@@ -3719,6 +3720,7 @@
37193720
</rules>
37203721
<repeat>[[NWAVE]]</repeat>
37213722
<array>true</array>
3723+
<datacolumn>VISAMP</datacolumn>
37223724
<datarange>
37233725
<name>RANGE_POSITIVE</name>
37243726
<min>0.0</min>
@@ -3760,6 +3762,7 @@
37603762
</rules>
37613763
<repeat>[[NWAVE]]</repeat>
37623764
<array>true</array>
3765+
<datacolumn>VISPHI</datacolumn>
37633766
<datarange>
37643767
<name>RANGE_POSITIVE</name>
37653768
<min>0.0</min>
@@ -3912,6 +3915,7 @@
39123915
</rules>
39133916
<repeat>[[NWAVE]]</repeat>
39143917
<array>true</array>
3918+
<datacolumn>RVIS</datacolumn>
39153919
<datarange>
39163920
<name>RANGE_POSITIVE</name>
39173921
<min>0.0</min>
@@ -3946,6 +3950,7 @@
39463950
</rules>
39473951
<repeat>[[NWAVE]]</repeat>
39483952
<array>true</array>
3953+
<datacolumn>IVIS</datacolumn>
39493954
<datarange>
39503955
<name>RANGE_POSITIVE</name>
39513956
<min>0.0</min>
@@ -4219,6 +4224,7 @@
42194224
</rules>
42204225
<repeat>[[NWAVE]]</repeat>
42214226
<array>true</array>
4227+
<datacolumn>T3AMP</datacolumn>
42224228
<datarange>
42234229
<name>RANGE_POSITIVE</name>
42244230
<min>0.0</min>
@@ -4260,6 +4266,7 @@
42604266
</rules>
42614267
<repeat>[[NWAVE]]</repeat>
42624268
<array>true</array>
4269+
<datacolumn>T3PHI</datacolumn>
42634270
<datarange>
42644271
<name>RANGE_POSITIVE</name>
42654272
<min>0.0</min>
@@ -4655,6 +4662,7 @@
46554662
</rules>
46564663
<repeat>[[NWAVE]]</repeat>
46574664
<array>true</array>
4665+
<datacolumn>FLUXDATA</datacolumn>
46584666
<datarange>
46594667
<name>RANGE_POSITIVE</name>
46604668
<min>0.0</min>

0 commit comments

Comments
 (0)