diff --git a/RTCP/Run/src/LOFAR/Locations.py b/RTCP/Run/src/LOFAR/Locations.py index 8ca22bb961075c21fc9c82cc8c4ee2be7c77ddc6..cf27575dbc1f311c187b384c1f8923825a8dfc22 100644 --- a/RTCP/Run/src/LOFAR/Locations.py +++ b/RTCP/Run/src/LOFAR/Locations.py @@ -33,6 +33,31 @@ class Locations: "Storage": "gnu_openmpi-opt", } ) + self.files.update( { + # allows ${HOME} to be resolved in other paths + "home": homeDir(), + + # the parset that will be written by us and read by the sections + # the observation ID is included to allow parallel observations + "parset": "${RUNDIR}/RTCP-${MSNUMBER}.parset", + + # where to store logs + "logdir": "/log/L${YEAR}_${MSNUMBER}", + + # where to start the executables. rundir needs to be reachable + # for all sections. + "rundir": "${BASEDIR}", + + # locations of the observation id counter and tables + "mslist": "/log/MSList", + "nextmsnumber": "/log/nextMSNumber", + } ) + + self.nodes.update( { + # on which node to start the mpirun for Storage + "storagemaster": "listfen", + } ) + if self.isproduction: self.files.update( { # the base directory most paths will be related to @@ -42,6 +67,10 @@ class Locations: "cnproc": "${BASEDIR}/bin/CN_Processing", "ionproc": "${BASEDIR}/bin/IONProc", "storage": "${BASEDIR}/bin/Storage", + + # where to start the executables. rundir needs to be reachable + # for all sections. + "rundir": "${BASEDIR}/share", } ) self.nodes.update( { @@ -66,31 +95,6 @@ class Locations: "logserver": "", } ) - self.files.update( { - # allows ${HOME} to be resolved in other paths - "home": homeDir(), - - # the parset that will be written by us and read by the sections - # the observation ID is included to allow parallel observations - "parset": "${RUNDIR}/RTCP-${MSNUMBER}.parset", - - # where to store logs - "logdir": "/log/L${YEAR}_${MSNUMBER}", - - # where to start the executables. rundir needs to be reachable - # for all sections. - "rundir": "${BASEDIR}", - - # locations of the observation id counter and tables - "mslist": "/log/MSList", - "nextmsnumber": "/log/nextMSNumber", - } ) - - self.nodes.update( { - # on which node to start the mpirun for Storage - "storagemaster": "listfen", - } ) - def setFilename(self,name,path): self.files[name] = path diff --git a/RTCP/Run/src/runOLAP.py b/RTCP/Run/src/runOLAP.py index cd534459d35965008b3bdac8e5e5290c8664ca0e..a4992ec7a88ec617b952d28605eed75eb6e4f7ba 100755 --- a/RTCP/Run/src/runOLAP.py +++ b/RTCP/Run/src/runOLAP.py @@ -139,7 +139,7 @@ if __name__ == "__main__": psgroup.add_option( "-s", "--starttime", dest = "starttime", type = "string", - default = "+00:00:15", + default = "+30", help = "set the start time (syntax: timestamp, [YYYY-MM-DD] HH:MM[:SS], +seconds or +HH:MM[:SS]) [%default]" ) psgroup.add_option( "-r", "--runtime",