Update DRP archiving for new PypeIt output formats

[jmader]

PypeIt v1.16 has changed the output directories and file names slightly. Some new files exist, too.

pypeit_files/keck_deimos_A/keck_deimos_A/Masters --> Calibrations

• MasterArc_A_1_MSC02.fits --> Arc_A_0_MSC02.fits

pypeit_files/keck_deimos_A/keck_deimos_A/QA/PNGs

• New DET01.png
• New Arc_FWHMfit*.png

[jmader]

Simple update made and tested. Is backwards compatible and works with both Masters/ and Calibrations/.

diff --git a/src/instrument.py b/src/instrument.py index 10adf8f..e37a389 100644 --- a/src/instrument.py +++ b/src/instrument.py @@ -1115,11 +1115,12 @@ class Instrument(dep.DEP): if os.path.isfile(f): files.append(f)

Search for all files with a matching koaid

         associatedFiles = []

• subDir = ['/Masters', '/Calibrations'] for rootdir, dirs, fileList in os.walk(datadir): for file in fileList: if koaid in file: files.append(os.path.join(rootdir, file))
• if file.startswith('Master') or file.startswith('Arc'):

• if any(sub in rootdir for sub in subDir) or file.startswith('Arc'): associatedFiles.append(os.path.join(rootdir, file))

       # Now search for all associated files

  @@ -1131,7 +1132,7 @@ class Instrument(dep.DEP): arcSearch = file[start:end]

  Search for all master calibrations and arc QA plots for this detector

           for afile in associatedFiles:

• if '/Master' in afile and masterSearch in afile:
• if any(sub in afile for sub in subDir) and masterSearch in afile: if afile not in files: files.append(afile) if '/Arc' in afile and arcSearch in afile: