changing default tile in places

sdss · Nov 28, 2023 · f13eccb · f13eccb
1 parent 5edf144
commit f13eccb
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 40 deletions.
diff --git a/bin/build_super_arc b/bin/build_super_arc
@@ -35,7 +35,7 @@ def _header_fix(fits_file, target_mjd, target_tileid=None):
 		f[0].header["MJD"] = target_mjd
 		if target_tileid is not None:
 			f[0].header["TILE_ID"] = target_tileid
-	
+
 		f.writeto(fits_file, overwrite=True)
 
 def parse_arguments(args=None):
@@ -55,7 +55,7 @@ def parse_arguments(args=None):
 if __name__ == "__main__":
     # parse arguments
     cmd_args = parse_arguments(args=sys.argv[1:])
-    
+
     # extract metadata for target MJDs
     raw_paths = md.locate_new_frames(hemi="s", mjd=cmd_args.mjds, camera="*", expnum="????????")
     _ = md.extract_metadata(raw_paths)
@@ -67,7 +67,7 @@ if __name__ == "__main__":
     # get max MJD and tileid for new supers
     target_mjd = arcs.mjd.max()
     target_tileid = arcs.loc[arcs.mjd == target_mjd].tileid.max()
-    
+
     # initialize the masters paths list
     masters_paths = []
 
@@ -76,10 +76,10 @@ if __name__ == "__main__":
         # set current lamp status
         lamps_current = lamps_status.copy()
         lamps_current[lamp] = True
-        
+
         # group arcs into analogs of current lamp
-        analogs, cpaths, mpaths = md.get_analog_groups(tileid=1111, mjd=target_mjd, imagetyp="arc", **lamps_current)
-        
+        analogs, cpaths, mpaths = md.get_analog_groups(tileid=11111, mjd=target_mjd, imagetyp="arc", **lamps_current)
+
         for i, (keys, analog) in enumerate(analogs.items()):
             # unpack keys
             tileid, mjd, imagetyp, camera = keys
@@ -88,13 +88,13 @@ if __name__ == "__main__":
             mpixmask = path.full("lvm_master", drpver=drpver, kind="mpixmask", **masters["pixmask"])
             mbias = path.full("lvm_master", drpver=drpver, kind="mbias", **masters["bias"])
             mdark = path.full("lvm_master", drpver=drpver, kind="mdark", **masters["dark"])
-            
+
             # preproc and detrend raw arcs
             for j, (_, arc) in enumerate(analog.iterrows()):
                 rpath = path.full("lvm_raw", camspec=arc.camera, **arc.to_dict())
                 ppath = path.full("lvm_anc", drpver=drpver, kind="p", imagetype=arc.imagetyp, **arc.to_dict())
                 cpath = cpaths[keys][j]
-                
+
                 os.makedirs(os.path.dirname(ppath), exist_ok=True)
                 if os.path.isfile(ppath):
                     log.info(f"skipping {ppath}, file already exist")
@@ -104,7 +104,7 @@ if __name__ == "__main__":
                     log.info(f"skipping {cpath}, file already exist")
                 else:
                     imageMethod.detrend_frame(in_image=ppath, out_image=cpath, in_bias=mbias, in_dark=mdark, in_slitmap=Table(drp.fibermap.data))
-            
+
             # define master path
             mpath = mpaths[i].replace("marc", f"marc_{lamp}")
             # create master arcs
@@ -118,15 +118,15 @@ if __name__ == "__main__":
 
             # update masters paths list
             masters_paths.append(mpath)
-    
+
     # extract frames
     master_paths = [os.path.join(root, file) for root, _, files in os.walk(os.getenv("LVM_SPECTRO_REDUX")) for file in files if file.startswith("lvm-marc_") and file.endswith(".fits")]
     master_arcs = md.extract_metadata(kind="master", frames_paths=master_paths)
     for _, marc in master_arcs.iterrows():
         lamp = marc[lamps].astype(int).idxmax(0)
         mpath = path.full("lvm_master", drpver=drpver, kind=f"marc_{lamp}", **marc.to_dict())
         xpath = path.full("lvm_master", drpver=drpver, kind=f"xmarc_{lamp}", **marc.to_dict())
-        
+
         # match masters
         masters = md.match_master_metadata(target_imagetyp="arc", target_mjd=target_mjd, target_camera=marc.camera)
 
@@ -136,7 +136,7 @@ if __name__ == "__main__":
 
         # update masters paths list
         masters_paths.append(xpath)
-    
+
     # update masters metadata
     new_masters = md.extract_metadata(kind="master", frames_paths=masters_paths)
     print(new_masters.to_string())
diff --git a/bin/build_super_trace b/bin/build_super_trace
@@ -58,7 +58,7 @@ def _header_fix(fits_file, target_mjd, target_tileid=None):
 		f[0].header["MJD"] = target_mjd
 		if target_tileid is not None:
 			f[0].header["TILE_ID"] = target_tileid
-	
+
 		f.writeto(fits_file, overwrite=True)
 
 def parse_arguments(args=None):
@@ -78,7 +78,7 @@ def parse_arguments(args=None):
 if __name__ == "__main__":
     # parse arguments
     cmd_args = parse_arguments(args=sys.argv[1:])
-    
+
     # extract metadata for target MJDs
     raw_paths = md.locate_new_frames(hemi="s", mjd=cmd_args.mjds, camera="*", expnum="????????")
     _ = md.extract_metadata(raw_paths)
@@ -90,7 +90,7 @@ if __name__ == "__main__":
     # get max MJD and tileid for new supers
     target_mjd = flats.mjd.max()
     target_tileid = flats.loc[flats.mjd == target_mjd].tileid.max()
-    
+
     # initialize the masters paths list
     masters_paths = []
 
@@ -107,10 +107,10 @@ if __name__ == "__main__":
         else:
             lamps_current = {"ldls": False, "quartz": True}
             lamp = "quartz"
-        
+
         # group flats into analogs of current lamp
-        analogs, cpaths, mpaths = md.get_analog_groups(tileid=1111, mjd=target_mjd, imagetyp="flat", camera=camera, **lamps_current)
-        
+        analogs, cpaths, mpaths = md.get_analog_groups(tileid=11111, mjd=target_mjd, imagetyp="flat", camera=camera, **lamps_current)
+
         for i, (keys, analog) in enumerate(analogs.items()):
             # unpack keys
             tileid, mjd, imagetyp, camera = keys
@@ -119,13 +119,13 @@ if __name__ == "__main__":
             mpixmask = path.full("lvm_master", drpver=drpver, kind="mpixmask", **masters["pixmask"])
             mbias = path.full("lvm_master", drpver=drpver, kind="mbias", **masters["bias"])
             mdark = path.full("lvm_master", drpver=drpver, kind="mdark", **masters["dark"])
-            
+
             # preproc and detrend raw flats
             for j, (_, flat) in enumerate(analog.iterrows()):
                 rpath = path.full("lvm_raw", camspec=flat.camera, **flat.to_dict())
                 ppath = path.full("lvm_anc", drpver=drpver, kind="p", imagetype=flat.imagetyp, **flat.to_dict())
                 cpath = cpaths[keys][j]
-                
+
                 os.makedirs(os.path.dirname(ppath), exist_ok=True)
                 if os.path.isfile(ppath):
                     log.info(f"skipping {ppath}, file already exist")
@@ -135,7 +135,7 @@ if __name__ == "__main__":
                     log.info(f"skipping {cpath}, file already exist")
                 else:
                     imageMethod.detrend_frame(in_image=ppath, out_image=cpath, in_bias=mbias, in_dark=mdark, in_slitmap=Table(drp.fibermap.data))
-            
+
             # define master path
             mpath = path.full("lvm_master", drpver=drpver, kind=f"mflat_{lamp}", tileid=target_tileid, mjd=target_mjd, camera=camera)
             # create master flats
@@ -146,15 +146,15 @@ if __name__ == "__main__":
 
             # update masters paths list
             masters_paths.append(mpath)
-    
+
     # extract frames
     master_paths = [os.path.join(root, file) for root, _, files in os.walk(os.getenv("LVM_SPECTRO_REDUX")) for file in files if file.startswith("lvm-mflat_") and file.endswith(".fits")]
     master_flats = md.extract_metadata(kind="master", frames_paths=master_paths)
     for _, mflat in master_flats.iterrows():
         lamp = mflat[lamps].astype(int).idxmax(0)
         mpath = path.full("lvm_master", drpver=drpver, kind=f"mflat_{lamp}", **mflat.to_dict())
         xpath = path.full("lvm_master", drpver=drpver, kind=f"xmflat_{lamp}", **mflat.to_dict())
-        
+
         mtrace_peak = path.full("lvm_master", drpver=drpver, kind="mtrace", **mflat.to_dict())
         mtrace_fwhm = path.full("lvm_master", drpver=drpver, kind="mfwhm", **mflat.to_dict())
         # run tracing
@@ -166,7 +166,7 @@ if __name__ == "__main__":
 
         # update masters paths list
         # masters_paths.append(xpath)
-    
+
     # update masters metadata
     new_masters = md.extract_metadata(kind="master", frames_paths=masters_paths)
     print(new_masters.to_string())
diff --git a/python/lvmdrp/core/image.py b/python/lvmdrp/core/image.py
@@ -386,7 +386,7 @@ def __truediv__(self, other):
                     new_error = self._error / other
                 else:
                     new_error = None
-                
+
                 img = copy(self)
                 img.setData(data=new_data, error=new_error)
                 return img
@@ -804,11 +804,11 @@ def convertUnit(self, to, assume="adu", gain_field="GAIN", inplace=False):
         # early return if no data or header to compute conversion
         if new_image._header is None or new_image._data is None:
             return new_image
-        
+
         current = self._header.get("BUNIT", assume)
         if current == to:
             return new_image
-        
+
         if current != to:
             exptime = self.getHdrValue("EXPTIME")
             gains = self.getHdrValue(f"AMP? {gain_field}")
@@ -829,7 +829,7 @@ def convertUnit(self, to, assume="adu", gain_field="GAIN", inplace=False):
                     factor = exptime
                 else:
                     raise ValueError(f"Cannot convert from {current} to {to}")
-                
+
                 new_image.setSection(
                     section=sects[i],
                     subimg=new_image.getSection(section=sects[i]) * factor,
@@ -1117,13 +1117,13 @@ def writeFitsData(
                 hdu = pyfits.PrimaryHDU(self._error)
             elif extension_error > 0 and extension_error is not None:
                 hdus[extension_error] = pyfits.ImageHDU(self._error, name="ERROR")
-            
+
             # frames hdu
             if extension_frames == 0:
                 hdu = pyfits.PrimaryHDU(self._individual_frames)
             elif extension_frames > 0 and extension_frames is not None:
                 hdus[extension_frames] = pyfits.BinTableHDU(self._individual_frames, name="FRAMES")
-            
+
             # slitmap hdu
             if extension_slitmap == 0:
                 hdu = pyfits.PrimaryHDU(self._slitmap)
@@ -1695,7 +1695,7 @@ def fitPoly(self, axis="y", order=4, plot=-1):
             new_mask = numpy.isnan(fit_result)
         else:
             new_mask = None
-        
+
         new_img = copy(self)
         new_img.setData(data=fit_result, mask=new_mask)
         return new_img
@@ -1743,7 +1743,7 @@ def traceFWHM(
                 1
             ]  #    traceFWHM.setSlice(i, axis='y', data = fwhm_fit[0], mask = fwhm_fit[1]) # insert the result into the trace mask
             # return traceFWHM
-        return (fwhm, mask)    
+        return (fwhm, mask)
 
 
     def extractSpecAperture(self, TraceMask, aperture):
@@ -1784,7 +1784,7 @@ def extractSpecAperture(self, TraceMask, aperture):
                 )
             if self._mask is not None:
                 mask[good_pix[:, i], i] = numpy.sum(self._mask[:, i][pixels], 1) > 0
-        
+
         # update mask with trace mask
         mask |= bad_pix
         return data, error, mask
@@ -2374,7 +2374,7 @@ def setIndividualFrames(self, images):
         self._individual_frames = Table(names=["TILEID", "MJD", "EXPNUM", "SPEC", "CAMERA", "EXPTIME"], dtype=(int, int, int, str, str, float))
         for img in images:
             self._individual_frames.add_row([
-                img._header.get("TILEID", 1111),
+                img._header.get("TILEID", 11111),
                 img._header.get("MJD"),
                 img._header.get("EXPOSURE"),
                 img._header.get("SPEC"),
@@ -2384,7 +2384,7 @@ def setIndividualFrames(self, images):
 
     def getSlitmap(self):
         return self._slitmap
-    
+
     def setSlitmap(self, slitmap):
         self._slitmap = slitmap
 
@@ -2597,15 +2597,15 @@ def combineImages(
         new_header["ISMASTER"] = (True, "Is this a combined (master) frame")
         new_header["NFRAMES"] = (nexp, "Number of exposures combined")
         new_header["STATCOMB"] = (method, "Statistic used to combine images")
-        
+
         # add combined lamps to header
         if images[0]._header["IMAGETYP"] == "flat":
             lamps = CON_LAMPS
         elif images[0]._header["IMAGETYP"] == "arc":
             lamps = ARC_LAMPS
         else:
             lamps = []
-        
+
         if lamps:
             new_lamps = set()
             for image in images:

diff --git a/python/lvmdrp/functions/run_drp.py b/python/lvmdrp/functions/run_drp.py
@@ -383,8 +383,8 @@ def create_output_path(kind: str, flavor: str, mjd: int, tileid: int, camera: st
 
     Creates the output file path for the science frames or the master arc/flats.
     For example, the extracted fiber spectra is
-    "1111/60115/ancillary/lvm-xobject-b1-00060115.fits" for science frames
-    or "1111/60115/calib/lvm-xmarc-b1.fits" for the master arc frame.
+    "11111/60115/ancillary/lvm-xobject-b1-00060115.fits" for science frames
+    or "11111/60115/calib/lvm-xmarc-b1.fits" for the master arc frame.
 
     Parameters
     ----------

diff --git a/python/lvmdrp/utils/examples.py b/python/lvmdrp/utils/examples.py
@@ -137,7 +137,7 @@ def get_frames_metadata(mjd: Union[str, int] = None, path: str = None, suffix: s
         camera, expnum = parse_sdr_name(frame_path)
         spec = f"sp{camera[-1]}"
         exptime = header["EXPTIME"]
-        tileid = header.get("TILEID", 1111)
+        tileid = header.get("TILEID", 11111)
         qual = header.get("QUALITY", "excellent")
         frames_table.add_row([imagetyp, spec, mjd, camera, expnum, exptime,
                               tileid, qual, str(frame_path), frame_path.stem])