Skip to content

Commit

Permalink
jpl: Stop building and move to obsolete directory
Browse files Browse the repository at this point in the history
Since FLUXES stopped using it no Starlink software uses JPL and it's not
really Starlink software (it has minor patches to be more Starlink compliant).
  • Loading branch information
timj committed Aug 10, 2012
1 parent d3476d9 commit 2791728
Show file tree
Hide file tree
Showing 34 changed files with 42 additions and 44 deletions.
14 changes: 7 additions & 7 deletions .gitignore
Expand Up @@ -962,13 +962,13 @@ libraries/img/img_tmp2x.f
libraries/img/img_tmp3x.f
libraries/img/img_tmpx.f

libraries/jpl/ephdsk
libraries/jpl/jplconst
libraries/jpl/jpleph.dat
libraries/jpl/jplpleph
libraries/jpl/jplstate
libraries/jpl/runtesteph
libraries/jpl/shorteph
libraries/obsolete/jpl/ephdsk
libraries/obsolete/jpl/jplconst
libraries/obsolete/jpl/jpleph.dat
libraries/obsolete/jpl/jplpleph
libraries/obsolete/jpl/jplstate
libraries/obsolete/jpl/runtesteph
libraries/obsolete/jpl/shorteph

libraries/kaplibs/aif/conly-files
libraries/kaplibs/ccg/conly-files
Expand Down
5 changes: 2 additions & 3 deletions Makefile.dependencies
Expand Up @@ -949,7 +949,6 @@ $(MANIFESTS)/fluxes: \
$(MANIFESTS)/generic \
$(MANIFESTS)/hds \
$(MANIFESTS)/hlp \
$(MANIFESTS)/jpl \
$(MANIFESTS)/mers \
$(MANIFESTS)/par \
$(MANIFESTS)/pcs \
Expand Down Expand Up @@ -1441,9 +1440,10 @@ $(MANIFESTS)/jpeg:
&& $(CONFIG_CPT) \
&& $(MAKE_CPT)

# Component jpl is OBSOLETE -- do not build
$(MANIFESTS)/jpl: \
$(MANIFESTS)/star2html
cd libraries/jpl \
cd libraries/obsolete/jpl \
&& $(MAKE_CPT)

$(MANIFESTS)/kaplibs: \
Expand Down Expand Up @@ -3129,7 +3129,6 @@ SUPPORTED_COMPONENTS = \
$(MANIFESTS)/info \
$(MANIFESTS)/init \
$(MANIFESTS)/jcmtdr \
$(MANIFESTS)/jpl \
$(MANIFESTS)/kaplibs \
$(MANIFESTS)/kappa \
$(MANIFESTS)/messgen \
Expand Down
1 change: 0 additions & 1 deletion Makefile.in
Expand Up @@ -65,7 +65,6 @@ ALL_TARGETS = \
$(MANIFESTS)/info \
$(MANIFESTS)/init \
$(MANIFESTS)/itcl \
$(MANIFESTS)/jpl \
$(MANIFESTS)/kappa \
$(MANIFESTS)/kaprh \
$(MANIFESTS)/match \
Expand Down
56 changes: 28 additions & 28 deletions componentset.xml
Expand Up @@ -619,7 +619,7 @@ and its coordinates are displayed.
</component>

<component id="fluxes">
<version>1.3-1</version>
<version>1.4-1</version>
<path>applications/fluxes</path>
<description>FLUXES - JCMT Postion and Flux Density Calibration</description>
<abstract><p>
Expand All @@ -630,7 +630,7 @@ beam-sizes employed by the UKT14 and SCUBA receivers on the
JCMT telescope based on Mauna Kea, Hawaii.
</p></abstract>
<dependencies >
<build>pcs</build><build>sae</build><build>mers</build><build>fio</build><build>par</build><build>sla</build><build>jpl</build><link>fio</link><link>sla</link><link>jpl</link><link>mers</link><sourceset>star2html</sourceset>
<build>pcs</build><build>sae</build><build>mers</build><build>fio</build><build>par</build><build>sla</build><link>fio</link><link>sla</link><link>mers</link><sourceset>star2html</sourceset>
</dependencies>
<developers>
<person>
Expand Down Expand Up @@ -5495,32 +5495,6 @@ understand.
<bugreports>starlink@jiscmail.ac.uk</bugreports>
</component>

<component id="jpl" support="S">
<version>2.0-2</version>
<path>libraries/jpl</path>
<description>JPL Ephemeris access routines</description>
<abstract>The JPL library and data sets provide high-accuracy
predictions for the positions and velocities of the Sun and planets.
</abstract>
<dependencies >
<sourceset>star2html</sourceset>
</dependencies>
<developers>
<person>
<name>Pat Wallace</name>
<uname>ptw</uname>
<email>ptw@star.rl.ac.uk</email>
<role>owner</role>
</person>
<person>
<name>A. J. J. Broderick</name>
<uname>ajjb</uname>
</person>
</developers>
<documentation> sun87</documentation>
<bugreports>starlink@jiscmail.ac.uk</bugreports>
</component>

<component id="kaplibs" support="S">
<version>3.3</version>
<path>libraries/kaplibs</path>
Expand Down Expand Up @@ -5705,6 +5679,32 @@ independently of KAPPA.</p></abstract>
</copyright>
</component>

<component id="jpl" status="obsolete" support="U">
<version>2.0-2</version>
<path>libraries/obsolete/jpl</path>
<description>JPL Ephemeris access routines</description>
<abstract>The JPL library and data sets provide high-accuracy
predictions for the positions and velocities of the Sun and planets.
</abstract>
<dependencies >
<sourceset>star2html</sourceset>
</dependencies>
<developers>
<person>
<name>Pat Wallace</name>
<uname>ptw</uname>
<email>ptw@star.rl.ac.uk</email>
<role>owner</role>
</person>
<person>
<name>A. J. J. Broderick</name>
<uname>ajjb</uname>
</person>
</developers>
<documentation> sun87</documentation>
<bugreports>starlink@jiscmail.ac.uk</bugreports>
</component>

<component id="mag" status="obsolete" support="U">
<version>2.0-2</version>
<path>libraries/obsolete/mag</path>
Expand Down
2 changes: 1 addition & 1 deletion libraries/configure.ac
Expand Up @@ -13,7 +13,7 @@ AC_PROG_MAKE_SET
dnl The following list must be kept up-to-date by hand.
dnl The list is available as the substitution variable @subdirs@.
dnl (must be kept on one line)
AC_CONFIG_SUBDIRS(agi ard ary ast atl cat chr cnf ctg ems fio gks gns graphpar grp gsd gwm hds hlp idi img irq jpl kaplibs lpg mers nbs ndf ndg one pal par pcs pda pgp prm psx ref sae sgs shl sla snx starmem starutil thr trn)
AC_CONFIG_SUBDIRS(agi ard ary ast atl cat chr cnf ctg ems fio gks gns graphpar grp gsd gwm hds hlp idi img irq kaplibs lpg mers nbs ndf ndg one pal par pcs pda pgp prm psx ref sae sgs shl sla snx starmem starutil thr trn)

AC_CONFIG_FILES(Makefile)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE component SYSTEM "componentinfo.dtd">

<component id="jpl" support="S">
<component id="jpl" status="obsolete" support="U">
<version>2.0-2</version>
<path>libraries/jpl</path>
<path>libraries/obsolete/jpl</path>
<description>JPL Ephemeris access routines</description>
<abstract>The JPL library and data sets provide high-accuracy
predictions for the positions and velocities of the Sun and planets.
Expand Down
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE component SYSTEM "componentinfo.dtd">

<component id="@PACKAGE@" support="S">
<component id="@PACKAGE@" status="obsolete" support="U">
<version>@PACKAGE_VERSION@</version>
<path>libraries/jpl</path>
<path>libraries/obsolete/jpl</path>
<description>JPL Ephemeris access routines</description>
<abstract>The JPL library and data sets provide high-accuracy
predictions for the positions and velocities of the Sun and planets.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

4 comments on commit 2791728

@grahambell
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now on a clean Starlink build, attempting to reduce a SCUBA-2 calibrator with ORAC-DR, I get:
#35 Err: RECIPE ERROR: Could not find JPLEPH file at /export/data/gbell/star/etc/jpleph.dat at /export/data/gbell/star/bin/oracdr/src/lib/perl5/ORAC/Msg/EngineLaunch.pm line 434.

@timj
Copy link
Member Author

@timj timj commented on 2791728 Sep 20, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. The JPLEPH code in ORAC-DR should be removed. I had forgotten about that. I'll remove it.

@timj
Copy link
Member Author

@timj timj commented on 2791728 Sep 20, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fixed with Starlink/ORAC-DR@0ed08ba

@grahambell
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! The observation I was trying reduced successfully (albeit extremely slowly) now.

Please sign in to comment.