Commit 94d2bfd5 authored by Vlad Kondratiev's avatar Vlad Kondratiev

few config changes related to CEP3 changes after the upgrade

parent c44d0dcf
......@@ -407,7 +407,7 @@ class TABeam:
loc=""
for l in xrange(len(cexec_output)):
if re.match("^-----", cexec_output[l]) is not None:
loc=cexec_output[l].split(" ")[1].split("-")[0]
loc=cexec_output[l].split(" ")[1].split("-")[0].split(".")[0]
else: # it means that we found the file and loc now has the locus node name where processed data are
# but we continue loop, as there can be several locus nodes with processed data for 1 beam if there were several splits
self.location.append(loc)
......@@ -442,7 +442,7 @@ class TABeam:
#log.info("OUTPUT = %s" % (", ".join(cexec_output)))
for l in xrange(len(cexec_output)):
if re.match("^-----", cexec_output[l]) is not None:
loc=cexec_output[l].split(" ")[1].split("-")[0]
loc=cexec_output[l].split(" ")[1].split("-")[0].split(".")[0]
else:
# first we are checking that this file (corresponding raw-file in the /data/ObsId) DO NOT already present
# in the current dictionary self.rawfiles. This is to deal with the case when rawdata are in /home area
......@@ -554,7 +554,7 @@ class TABeam:
for l in xrange(len(cexec_output)):
#log.info("l = %d (%d), line = %s" % (l, len(cexec_output), cexec_output[l]))
if re.match("^-----", cexec_output[l]) is not None:
loc=cexec_output[l].split(" ")[1].split("-")[0]
loc=cexec_output[l].split(" ")[1].split("-")[0].split(".")[0]
else:
# first we are checking that this file (exactly the same with full path) DO NOT already present
# in the current dictionary self.rawfiles. This is to deal with the case when rawdata are in /home area
......
......@@ -188,7 +188,9 @@ class CEP2Info:
# cexec command to run. Using this mapfile makes keep mapping of the locus to be always the same
self.cexeccmd="cexec"
# summary nodes
self.summary_nodes={"CS": "lhd002", "CV": "lhd002", "IS": "lhd002"}
self.summary_nodes={"CS": "lhdhead", "CV": "lhdhead", "IS": "lhdhead"}
# introduced specifically for CEP4 as the raw data are stored not under rawdir/ObsID
self.rawdir_suffix_specificator="*/"
# settings for CEP4
elif self.cluster_headnode[:5] == "head0" or self.cluster_headnode[:3] == "cpu":
......@@ -276,7 +278,7 @@ class CEP2Info:
try:
for l in range(len(cexec_output)):
if re.match("^-----", cexec_output[l]) is None:
self.alive_nodes.append(cexec_output[l-1].split(" ")[1].split("-")[0])
self.alive_nodes.append(cexec_output[l-1].split(" ")[1].split("-")[0].split(".")[0])
except Exception:
msg="Problem with connection to processing nodes...\nTry removing processing nodes' entries from your ~/.ssh/known_hosts file or try again later"
if log != None: log.error(msg)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment