Skip to content

Check false #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javierggt wants to merge 2 commits into from
Closed

Check false #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a07dba
make regex strings raw
javierggt Feb 25, 2025
0e628a8
do not check result
javierggt Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 34 additions & 21 deletions runasp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,17 +242,17 @@ def link_files(dir, indir, outdir, istart, istop, obiroot, skip_slot=None):
logger.verbose(
"skipping file out of timerange {}".format(mfile))
continue
aca0 = re.search('aca.*_(\d)_img0', mfile)
aca0 = re.search(r'aca.*_(\d)_img0', mfile)
if skip_slot and aca0:
aca_file_slot = int(aca0.group(1))
if aca_file_slot in skip_slot:
logger.verbose(
"skipping slot file on {}".format(mfile))
continue
obsparmatch = re.match('.*obs0a\.par(\.gz)?', mfile)
obsparmatch = re.match(r'.*obs0a\.par(\.gz)?', mfile)
if obsparmatch:
obimatch = re.match(
'.*axaf%s_obs0a\.par(\.gz)?' % obiroot, mfile)
r'.*axaf%s_obs0a\.par(\.gz)?' % obiroot, mfile)
if not obimatch:
logger.verbose("skipping obspar for different obi")
continue
Expand Down Expand Up @@ -312,22 +312,22 @@ def get_range_ai(ai_cmds, proc_range):
if not proc_range:
return ai_cmds
# if a single integer, return on that aspect interval
intmatch = re.match('^(\d+)$', proc_range)
intmatch = re.match(r'^(\d+)$', proc_range)
if intmatch:
interv = int(intmatch.group(1))
return [ai_cmds[int(intmatch.group(1))]]
# if of the form 0:1, return that range of intervals
# (python form, not inclusive)
imatch = re.match('^(\d+):(\d+)$', proc_range)
imatch = re.match(r'^(\d+):(\d+)$', proc_range)
if imatch:
return ai_cmds[int(imatch.group(1)):int(imatch.group(2))]
# if of the form 1: , return range 1 -> end
omatch = re.match('^(\d+):$', proc_range)
omatch = re.match(r'^(\d+):$', proc_range)
if omatch:
return ai_cmds[int(omatch.group(1)):]
# if of the form 0:+3000, find a tstop corresponding
# to tstart of aspect interval 0 plus 3000 seconds
tmatch = re.match('^(\d+):\+(\d+)$', proc_range)
tmatch = re.match(r'^(\d+):\+(\d+)$', proc_range)
if tmatch:
# get n seconds of specified interval
interv = int(tmatch.group(1))
Expand All @@ -348,7 +348,7 @@ def cut_stars(ai):
starlines = open(starfiles[0]).read().split("\n")
for slot in ai['skip_slot']:
starlines = [i for i in starlines
if not re.match("^\s+{}\s+1.*".format(slot), i)]
if not re.match(r"^\s+{}\s+1.*".format(slot), i)]
logger.info('Cutting stars by updating {}'.format(starfiles[0]))
with open(starfiles[0], "w") as newlist:
newlist.write("\n".join(starlines))
Expand Down Expand Up @@ -397,8 +397,12 @@ def run_ai(ais):
env=ascds_env, logfile=logger_fh)

if opt.fdc_file is not None:
tcsh_shell("pset asp_l1_std fdc='{}'".format(opt.fdc_file),
env=ascds_env, logfile=logger_fh)
tcsh_shell(
"pset asp_l1_std fdc='{}'".format(opt.fdc_file),
env=ascds_env,
logfile=logger_fh,
check=False,
)

for ai in ais:
pipe_cmd = 'flt_run_pipe -r {root} -i {indir} -o {outdir} \
Expand Down Expand Up @@ -429,16 +433,22 @@ def run_ai(ais):
pipe_cmd = pipe_cmd + f' -S {stop_pipe} '
logger.info('Running pipe command {}'.format(
pipe_cmd))
tcsh_shell(pipe_cmd,
env=ascds_env,
logfile=logger_fh)
tcsh_shell(
pipe_cmd,
env=ascds_env,
logfile=logger_fh,
check=False,
)
else:
first_pipe = pipe_cmd + \
f' -s {start_pipe} ' + " -S check_star_data"
logger.info('Running pipe command {}'.format(first_pipe))
tcsh_shell(first_pipe,
env=ascds_env,
logfile=logger_fh)
tcsh_shell(
first_pipe,
env=ascds_env,
logfile=logger_fh,
check=False,
)
star_files = glob(os.path.join(ai['outdir'], "*stars.txt"))
if not len(star_files) == 1:
logger.info(
Expand All @@ -451,9 +461,12 @@ def run_ai(ais):
if stop_pipe is not None:
second_pipe = second_pipe + f' -S {stop_pipe}'
logger.info('Running pipe command {}'.format(second_pipe))
tcsh_shell(second_pipe,
env=ascds_env,
logfile=logger_fh)
tcsh_shell(
second_pipe,
env=ascds_env,
logfile=logger_fh,
check=False,
)


def mock_stars_file(opt, ai):
Expand Down Expand Up @@ -590,7 +603,7 @@ def main(opt):
raise ValueError("No files found for glob %s"
% fileglob)
for mfile in match:
if re.match(".*\.gz", mfile):
if re.match(r".*\.gz", mfile):
logger.verbose('Unzipping {}'.format(mfile))
bash("gunzip -f %s" % os.path.abspath(mfile))

Expand Down Expand Up @@ -620,7 +633,7 @@ def main(opt):
for ofile in obspar_files:
obspar = get_obspar(ofile)
if obspar['obi_num'] == obi_num:
obsmatch = re.search('axaf(.+)_obs0a\.par', ofile)
obsmatch = re.search(r'axaf(.+)_obs0a\.par', ofile)
obiroot = obsmatch.group(1)
if not obiroot:
raise ValueError("no obspar for obi %d" % obi_num)
Expand Down