From 462a281ffb0a0c1ab96793dc47a48fd9157051dd Mon Sep 17 00:00:00 2001
From: fangyuedong <fangyuedong@qxslab.cn>
Date: Wed, 13 Dec 2023 21:48:05 +0800
Subject: [PATCH] fix (temporarily) the crash in ChipOutput due to
 img_type='CAL'

---
 ObservationSim/Config/Header/ImageHeader.py | 2 +-
 ObservationSim/Config/_util.py              | 3 ++-
 ObservationSim/Instrument/Chip/Chip.py      | 2 +-
 ObservationSim/_util.py                     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ObservationSim/Config/Header/ImageHeader.py b/ObservationSim/Config/Header/ImageHeader.py
index 3a7673f..a078f00 100644
--- a/ObservationSim/Config/Header/ImageHeader.py
+++ b/ObservationSim/Config/Header/ImageHeader.py
@@ -383,7 +383,7 @@ def generatePrimaryHeader(xlen = 9216, ylen = 9232, pointNum = '1', ra = 60, dec
     # OBS_id = '1'+ obs_type[im_type] + str(int(project_cycle)) + str(int(run_counter)).rjust(2, '0') + pointNum.rjust(5,'0')
     OBS_id = get_obs_id(img_type=im_type, project_cycle=project_cycle, run_counter=run_counter, pointing_num=pointNum)
 
-    h_prim['OBJECT'] = str(int(project_cycle)) + pointNum.rjust(7,'0')
+    h_prim['OBJECT'] = str(int(project_cycle)) + pointNum.rjust(8, '0')
     h_prim['OBSID'] = OBS_id
     # h_prim['TELFOCUS'] = 'f/14'
     h_prim['EXPTIME'] = exptime
diff --git a/ObservationSim/Config/_util.py b/ObservationSim/Config/_util.py
index afc0bf3..964d5a2 100644
--- a/ObservationSim/Config/_util.py
+++ b/ObservationSim/Config/_util.py
@@ -1,6 +1,7 @@
 
 def get_obs_id(img_type='SCI', project_cycle=6, run_counter=0, pointing_num=0):
-    obs_type = {'SCI': '01', 'BIAS': '03', 'DARK': '07', 'FLAT': '11', 'CRS': '98', 'CRD': '99'}
+    # obs_type = {'SCI': '01', 'BIAS': '03', 'DARK': '07', 'FLAT': '11', 'CRS': '98', 'CRD': '99'}
+    obs_type = {'SCI': '01', 'BIAS': '03', 'DARK': '07', 'FLAT': '11', 'CRS': '98', 'CRD': '99', 'CAL': '01'}
     # obs_id = '1'+ obs_type[img_type] + str(int(project_cycle)) + str(int(run_counter)).rjust(2, '0') + str(pointing_num).rjust(5,'0')
     obs_id = '1'+ obs_type[img_type] + str(int(project_cycle)).rjust(2, '0') + str(int(run_counter)) + str(pointing_num).rjust(8,'0')
     return obs_id
diff --git a/ObservationSim/Instrument/Chip/Chip.py b/ObservationSim/Instrument/Chip/Chip.py
index 2e1c9ca..134e6aa 100755
--- a/ObservationSim/Instrument/Chip/Chip.py
+++ b/ObservationSim/Instrument/Chip/Chip.py
@@ -771,7 +771,7 @@ class Chip(FocalPlane):
                 DarkCombImg = galsim.ImageUS(DarkCombImg)
                 timestamp_obs += 10 * 60
                 chip_utils.outputCal(
-                    chip=chip,
+                    chip=self,
                     img=DarkCombImg,
                     ra_cen=ra_cen,
                     dec_cen=dec_cen,
diff --git a/ObservationSim/_util.py b/ObservationSim/_util.py
index b1de8e2..ac93733 100755
--- a/ObservationSim/_util.py
+++ b/ObservationSim/_util.py
@@ -135,7 +135,7 @@ def makeSubDir_PointingList(path_dict, config, pointing_ID=0):
             os.makedirs(imgDir, exist_ok=True)
         except OSError:
             pass
-    prefix = "MSC_" + str(pointing_ID).rjust(7, '0')
+    prefix = "MSC_" + str(pointing_ID).rjust(8, '0')
     subImgdir = os.path.join(imgDir, prefix)
     if not os.path.exists(subImgdir):
         try:
-- 
GitLab