bug 1362: production rundir is now /opt/lofar/share

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 
 

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",