diff --git a/CMake/variants/variants.lhn001 b/CMake/variants/variants.lhn001 index bee05566ce91fa3b31bc607e95e697b39a2fe4d0..bcc42b9ed102d0b7676fc53c09db3c3992df37d2 100644 --- a/CMake/variants/variants.lhn001 +++ b/CMake/variants/variants.lhn001 @@ -3,7 +3,6 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON) set(CASACORE_ROOT_DIR /opt/cep/casacore) set(CASAREST_ROOT_DIR /opt/cep/casarest) set(DAL_ROOT_DIR /globalhome/lofarsystem/packages/root/lhn/dal) -#set(ENV{HDF5_ROOT} /opt/cep/storage/hdf5) set(ENV{HDF5_ROOT} /opt/cep/hdf5) set(PYRAP_ROOT_DIR /opt/cep/pyrap) diff --git a/RTCP/Run/src/LogArchiver.sh b/RTCP/Run/src/LogArchiver.sh index 733a16337cd464ce490cc80483c47e03ac8e89ea..015bae67d2ee91a50d57edffb08e027be429578f 100755 --- a/RTCP/Run/src/LogArchiver.sh +++ b/RTCP/Run/src/LogArchiver.sh @@ -6,8 +6,7 @@ # # cron jobs don't set $PATH, so construct our own. -PATH=$PATH:/bin:/usr/bin:/opt/lofar/bin -export PATH +export PATH=$PATH:/bin:/usr/bin:/opt/lofar/bin source locations.sh diff --git a/RTCP/Run/src/OLAP.parset b/RTCP/Run/src/OLAP.parset index 59a6b16bb913274fb3c4353521cd7977a4e13261..ab67f546c6abb4f68a3a3b106307b01e27dfed1f 100644 --- a/RTCP/Run/src/OLAP.parset +++ b/RTCP/Run/src/OLAP.parset @@ -4,38 +4,43 @@ OLAP.correctClocks = T # -# Fibre length corrections for superterp stations using +# Fibre length corrections for core stations using # a single clock. # -PIC.Core.CS002LBA.clockCorrectionTime = 8.291395e-06 -PIC.Core.CS002HBA0.clockCorrectionTime = 8.291555e-06 -PIC.Core.CS002HBA1.clockCorrectionTime = 8.291235e-06 -PIC.Core.CS002HBA.clockCorrectionTime = 8.291395e-06 - -PIC.Core.CS003LBA.clockCorrectionTime = 6.890990e-06 -PIC.Core.CS003HBA0.clockCorrectionTime = 6.889845e-06 -PIC.Core.CS003HBA1.clockCorrectionTime = 6.890135e-06 -PIC.Core.CS003HBA.clockCorrectionTime = 6.889990e-06 - -PIC.Core.CS004LBA.clockCorrectionTime = 7.855759e-06 -PIC.Core.CS004HBA0.clockCorrectionTime = 7.861849e-06 -PIC.Core.CS004HBA1.clockCorrectionTime = 7.861669e-06 -PIC.Core.CS004HBA.clockCorrectionTime = 7.861759e-06 - -PIC.Core.CS005LBA.clockCorrectionTime = 8.507690e-06 -PIC.Core.CS005HBA0.clockCorrectionTime = 8.513765e-06 -PIC.Core.CS005HBA1.clockCorrectionTime = 8.513615e-06 -PIC.Core.CS005HBA.clockCorrectionTime = 8.513690e-06 - -PIC.Core.CS006LBA.clockCorrectionTime = 7.850904e-06 -PIC.Core.CS006HBA0.clockCorrectionTime = 7.855584e-06 -PIC.Core.CS006HBA1.clockCorrectionTime = 7.854224e-06 -PIC.Core.CS006HBA.clockCorrectionTime = 7.854904e-06 - -PIC.Core.CS007LBA.clockCorrectionTime = 7.885136e-06 -PIC.Core.CS007HBA0.clockCorrectionTime = 7.884946e-06 -PIC.Core.CS007HBA1.clockCorrectionTime = 7.885326e-06 -PIC.Core.CS007HBA.clockCorrectionTime = 7.885136e-06 +PIC.Core.CS002LBA.clockCorrectionTime = 8.339918e-06 +PIC.Core.CS002HBA0.clockCorrectionTime = 8.318834e-06 +PIC.Core.CS002HBA1.clockCorrectionTime = 8.318304e-06 +PIC.Core.CS002HBA.clockCorrectionTime = 8.318569e-06 + +PIC.Core.CS003LBA.clockCorrectionTime = 6.936566e-06 +PIC.Core.CS003HBA0.clockCorrectionTime = 6.917926e-06 +PIC.Core.CS003HBA1.clockCorrectionTime = 6.917872e-06 +PIC.Core.CS003HBA.clockCorrectionTime = 6.917899e-06 + +PIC.Core.CS004LBA.clockCorrectionTime = 7.905512e-06 +PIC.Core.CS004HBA0.clockCorrectionTime = 7.889961e-06 +PIC.Core.CS004HBA1.clockCorrectionTime = 7.889505e-06 +PIC.Core.CS004HBA.clockCorrectionTime = 7.889733e-06 + +PIC.Core.CS005LBA.clockCorrectionTime = 8.556805e-06 +PIC.Core.CS005HBA0.clockCorrectionTime = 8.542093e-06 +PIC.Core.CS005HBA1.clockCorrectionTime = 8.541791e-06 +PIC.Core.CS005HBA.clockCorrectionTime = 8.541942e-06 + +PIC.Core.CS006LBA.clockCorrectionTime = 7.905282e-06 +PIC.Core.CS006HBA0.clockCorrectionTime = 7.882360e-06 +PIC.Core.CS006HBA1.clockCorrectionTime = 7.882960e-06 +PIC.Core.CS006HBA.clockCorrectionTime = 7.882660e-06 + +PIC.Core.CS007LBA.clockCorrectionTime = 7.928823e-06 +PIC.Core.CS007HBA0.clockCorrectionTime = 7.913020e-06 +PIC.Core.CS007HBA1.clockCorrectionTime = 7.913260e-06 +PIC.Core.CS007HBA.clockCorrectionTime = 7.913140e-06 + +PIC.Core.CS401LBA.clockCorrectionTime = 8.06397e-06 +PIC.Core.CS401HBA0.clockCorrectionTime = 8.069604e-06 +PIC.Core.CS401HBA1.clockCorrectionTime = 8.069870e-06 +PIC.Core.CS401HBA.clockCorrectionTime = 8.069737e-06 # # Stations outside of the superterp (no correction needed) @@ -121,11 +126,6 @@ PIC.Core.CS302HBA0.clockCorrectionTime = 0 PIC.Core.CS302HBA.clockCorrectionTime = 0 PIC.Core.CS302HBA1.clockCorrectionTime = 0 -PIC.Core.CS401LBA.clockCorrectionTime = 0 -PIC.Core.CS401HBA0.clockCorrectionTime = 0 -PIC.Core.CS401HBA1.clockCorrectionTime = 0 -PIC.Core.CS401HBA.clockCorrectionTime = 0 - PIC.Core.CS501LBA.clockCorrectionTime = 0 PIC.Core.CS501HBA0.clockCorrectionTime = 0 PIC.Core.CS501HBA1.clockCorrectionTime = 0 @@ -158,6 +158,7 @@ PIC.Core.RS508HBA.clockCorrectionTime = 0 PIC.Core.RS509LBA.clockCorrectionTime = 0 PIC.Core.RS509HBA.clockCorrectionTime = 0 +# DE601 has a clock offset for unknown reasons PIC.Core.DE601LBA.clockCorrectionTime = 1.1e-6 PIC.Core.DE601HBA.clockCorrectionTime = 1.1e-6 diff --git a/RTCP/Run/src/startBGL.sh b/RTCP/Run/src/startBGL.sh index 99ebd63f04356a39296a051c4f6d874e2426d962..fdca0f27ec76621af30b46f2ab68700c6d034245 100755 --- a/RTCP/Run/src/startBGL.sh +++ b/RTCP/Run/src/startBGL.sh @@ -19,14 +19,20 @@ OBSID=$5 source /opt/lofar/bin/locations.sh ( + echo "---------------" date echo starting obs $OBSID echo "---------------" +STORAGE_PARSET=/opt/lofar/log/L$OBSID.parset + # Convert keys where needed /opt/lofar/bin/LOFAR/Parset.py -P $PARTITION $PARSET /opt/lofar/etc/OLAP.parset <(echo "$EXTRA_KEYS") > $IONPROC_PARSET && +# Copy the parset to NFS for post processing +(cp $IONPROC_PARSET $STORAGE_PARSET || true) && + # Make the /opt/lofar/log/latest symlink (ln -sfT `dirname $STORAGE_PARSET` /opt/lofar/log/latest || true) &&