Commit 3499eac2 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

* unified the naming of .cat and .log files.

* Changed the name of output folder of pointing to corresponding pointing.obs_id.
* fixed the order .cat hdr updating and the creation of .cat file.
* Changed the naming of shutter and flat reference image: chip IDs now all in 2 digits.
* Updated the __init__ method of ChipOutput
* Removed Config.py from ObservationSim.Config
* Cleaned codes in ObservationSim.py, ChipOutput
parent fcbac14e
......@@ -9,10 +9,7 @@ import matplotlib as mpl
mpl.use('Agg')
import yaml
from ObservationSim.Config import Config
from ObservationSim.Config.Config import config_dir
from ObservationSim.Instrument import Chip
from ObservationSim.PSF.PSFInterp import PSFInterp
......@@ -24,7 +21,6 @@ def defineCCD(iccd, config_file):
# print (key + " : " + str(value))
except yaml.YAMLError as exc:
print(exc)
# path_dict = config_dir(config=config, work_dir=config['work_dir'], data_dir=config['data_dir'])
chip = Chip(chipID=iccd, config=config)
#chip = Chip(chipID=iccd, ccdEffCurve_dir=path_dict["ccd_dir"], CRdata_dir=path_dict["CRdata_dir"], normalize_dir=path_dict["normalize_dir"], sls_dir=path_dict['sls_dir'], config=config)
return chip
......
......@@ -6,10 +6,7 @@ from itertools import islice
import numpy as np
import yaml
from ObservationSim.Config import Config
from ObservationSim.Config.Config import config_dir
from ObservationSim.Instrument import Chip
from ObservationSim.PSF.PSFInterp import PSFInterp
......@@ -21,7 +18,6 @@ def defineCCD(iccd, config_file):
# print (key + " : " + str(value))
except yaml.YAMLError as exc:
print(exc)
# path_dict = config_dir(config=config, work_dir=config['work_dir'], data_dir=config['data_dir'])
chip = Chip(chipID=iccd, config=config)
#chip = Chip(chipID=iccd, ccdEffCurve_dir=path_dict["ccd_dir"], CRdata_dir=path_dict["CRdata_dir"], normalize_dir=path_dict["normalize_dir"], sls_dir=path_dict['sls_dir'], config=config)
return chip
......
import unittest
from ObservationSim.MockObject.SpecDisperser import rotate90, SpecDisperser
from ObservationSim.Config import ChipOutput, Config
from ObservationSim.Config import ChipOutput
from ObservationSim.Instrument import Telescope, Chip, FilterParam, Filter, FocalPlane
from ObservationSim.MockObject import MockObject, Star
from ObservationSim.PSF import PSFGauss
......@@ -401,8 +401,6 @@ class TestSpecDisperse(unittest.TestCase):
print(key + " : " + str(value))
except yaml.YAMLError as exc:
print(exc)
# config = Config.read_config(configFn)
# path_dict = Config.config_dir(config,work_dir=work_dir, data_dir=data_dir)
filter_param = FilterParam()
......
Supports Markdown
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