Skip to content

Commit

Permalink
Merge pull request #77 from LCOGT/MTF-ECO-08Dec22
Browse files Browse the repository at this point in the history 
Mtf eco 08 dec22
  • Loading branch information
@mfitzasp
mfitzasp authored Dec 10, 2022
2 parents 40108ed + 2649a62 commit 86edd37
Show file tree
Hide file tree
Showing 13 changed files with 850 additions and 604 deletions.
19 changes: 11 additions & 8 deletions configs/aro/site_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@
'has_paddle': False, #paddle refers to something supported by the Python code, not the AP paddle.
'has_ascom_altaz': True,
'pointing_tel': 'tel1', # This can be changed to 'tel2'... by user. This establishes a default.
'home_after_unpark' : False,
#
'permissive_mount_reset' : 'no', # if this is set to yes, it will reset the mount at startup and when coordinates are out significantly
'west_clutch_ra_correction': -0.05323724387608619, #final: 0.0035776615398219747 -0.1450812805892454
Expand Down Expand Up @@ -420,10 +421,9 @@
'filter_count': 43,
'home_filter': 1,
'default_filter': "w",
'filter_list': ['PL','PR','PG','PB','HA','O3','S2', 'N2', 'NIR', 'up','gp', 'rp','ip','z','zp','y','EXO','JB','JV','Rc','Ic', 'air','w'], # A list of actual physical filters for the substitution function
'filter_reference': 1, # We choose to use W as the default filter. Gains taken at F9, Ceravolo 300mm
'filter_data': [['filter', 'filter_index', 'filter_offset', 'sky_gain', 'screen_gain', 'generic'],

# Columns for filter data are : ['filter', 'filter_index', 'filter_offset', 'sky_gain', 'screen_gain', 'alias']
'filter_data': [
['air', [0, 0], -800, 81.6, [2 , 20], 'ai'], # 0. Gains 20211020 Clear NE sky
['focus',[7, 0], 0, 72.8, [360 , 170], 'w '], # 1.
['Lum', [7, 0], 0, 72.8, [360 , 170], 'w '], # 2.
Expand Down Expand Up @@ -538,8 +538,8 @@

'CameraXSize' : 9600,
'CameraYSize' : 6422,
'MaxBinX' : 2,
'MaxBinY' : 2,
#'MaxBinX' : 2,
#'MaxBinY' : 2,
'StartX' : 1,
'StartY' : 1,

Expand All @@ -565,7 +565,6 @@
'maximum_bin': [1, 1, 0.2876],
'cosmics_at_default' : 'yes',
'cosmics_at_maximum' : 'yes',
'bin_enable':['2 2'],
'cycle_time': [18, 15, 15, 12], # 3x3 requires a 1, 1 reaout then a software bin, so slower.
'rbi_delay': 0., # This being zero says RBI is not available, eg. for SBIG.
'is_cmos': True,
Expand All @@ -592,8 +591,12 @@
'default_area': "Full",
'has_darkslide': True,
'shutter_type': "Electronic",

'flat_bin_spec': ['1,1', '2 2'], # List of binnings for flats
'flat_bin_spec': ['1,1','2,2'], #Default binning for flats
'darkbias_bin_spec': ['1,1','2,2'], #Default binning for flats
'bin_enable': ['1,1', '2,2'],
'dark_length' : 900,
'bias_count' : 10,
'dark_count' : 10,
'darkslide_com': 'COM17',
'has_screen': True,
'screen_settings': {
Expand Down
23 changes: 15 additions & 8 deletions configs/ec2/site_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
'pointing_calibration_on_startup': False,
'periodic_focus_time' : 0.5, # This is a time, in hours, over which to bypass automated focussing (e.g. at the start of a project it will not refocus if a new project starts X hours after the last focus)
'stdev_fwhm' : 0.5, # This is the expected variation in FWHM at a given telescope/camera/site combination. This is used to check if a fwhm is within normal range or the focus has shifted
'focus_exposure_time': 20, # Exposure time in seconds for exposure image
'focus_exposure_time': 10, # Exposure time in seconds for exposure image

'focus_trigger' : 5.0, # What FWHM increase is needed to trigger an autofocus
'solve_nth_image' : 10, # Only solve every nth image
Expand Down Expand Up @@ -187,7 +187,7 @@
'eve_screen_flat_dur': 1.0, # hours Duration, prior to next.
'operations_begin': -1.0, # - hours from Sunset
'eve_cooldown_offset': -.99, # - hours beforeSunset
'eve_sky_flat_offset': 0.5, # - hours beforeSunset
'eve_sky_flat_offset': 0.25, # - hours beforeSunset
'morn_sky_flat_offset': 0.4, # + hours after Sunrise
'morning_close_offset': 0.41, # + hours after Sunrise
'operations_end': 0.42,
Expand All @@ -214,6 +214,7 @@
'west_clutch_dec_correction': 0.0, #
'east_flip_ra_correction': 0.0, #
'east_flip_dec_correction': 0.0, # #
'home_after_unpark' : True,
'permissive_mount_reset' : 'yes', # if this is set to yes, it will reset the mount at startup and when coordinates are out significantly
'settings': {
'latitude_offset': 0.0, #Decimal degrees, North is Positive These *could* be slightly different than site.
Expand Down Expand Up @@ -340,10 +341,10 @@
#F4.9 setup
'start_at_config_reference': True,
'use_focuser_temperature': True,
'reference':13277, # 20210313 Nominal at 10C Primary temperature
'reference':12968, # 20210313 Nominal at 10C Primary temperature
'ref_temp': 6265.0, # Update when pinning reference
'coef_c': 0, # Negative means focus moves out as Primary gets colder
'coef_0': 13277, # Nominal intercept when Primary is at 0.0 C.
'coef_0': 12968, # Nominal intercept when Primary is at 0.0 C.
'coef_date': '20220914', #This appears to be sensible result 44 points -13 to 3C'reference': 6431, # Nominal at 10C Primary temperature
# #F9 setup
# 'reference': 4375, # Guess 20210904 Nominal at 10C Primary temperature
Expand Down Expand Up @@ -436,6 +437,7 @@
"parent": "telescope1",
"name": "RGGB" , # When there is no filter wheel, the filter will be named this.
'service_date': '20180101',
'flat_sky_gain' : 1200,
"driver": None, #"LCO.dual", # 'ASCOM.FLI.FilterWheel',
#"driver": "Maxim.Image", #"LCO.dual", # 'ASCOM.FLI.FilterWheel',
'ip_string': None,
Expand Down Expand Up @@ -514,8 +516,8 @@
'pix_scale': [1.569],
'CameraXSize' : 4096,
'CameraYSize' : 4096,
'MaxBinX' : 2,
'MaxBinY' : 2,
#'MaxBinX' : 2,
#'MaxBinY' : 2,
'StartX' : 1,
'StartY' : 1,

Expand All @@ -535,7 +537,7 @@
'maximum_bin': [1, 1, 0.269], # Matched to seeing situation by owner
'cosmics_at_default' : 'yes',
'cosmics_at_maximum' : 'yes',
'bin_enable': ['1 1'],

'cycle_time': [2, 2, 2, 2], # 3x3 requires a 1, 1 reaout then a software bin, so slower.
'rbi_delay': 0., # This being zero says RBI is not available, eg. for SBIG.
'is_cmos': False,
Expand All @@ -560,9 +562,14 @@
'areas_implemented': ["Full",'4x4d', "600%", "500%", "450%", "300%", "220%", "150%", "133%", "Full", "Sqr", '71%', '50%', '35%', '25%', '12%'],
'default_area': "Full",
'default_rotation': 0.0000,
'flat_bin_spec': '1,1', #Default binning for flats
'has_darkslide': False,
'darkslide_com': None,
'flat_bin_spec': ['1,1'], #Default binning for flats
'darkbias_bin_spec': ['1,1'], #Default binning for flats
'bin_enable': ['1 1'],
'dark_length' : 900,
'bias_count' : 10,
'dark_count' : 10,

'shutter_type': "Electronic",
'has_screen': True,
Expand Down
53 changes: 31 additions & 22 deletions configs/eco/site_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
'pointing_calibration_on_startup': False,
'periodic_focus_time' : 0.5, # This is a time, in hours, over which to bypass automated focussing (e.g. at the start of a project it will not refocus if a new project starts X hours after the last focus)
'stdev_fwhm' : 0.5, # This is the expected variation in FWHM at a given telescope/camera/site combination. This is used to check if a fwhm is within normal range or the focus has shifted
'focus_exposure_time': 60, # Exposure time in seconds for exposure image
'focus_exposure_time': 120, # Exposure time in seconds for exposure image

'focus_trigger' : 5.0, # What FWHM increase is needed to trigger an autofocus
'solve_nth_image' : 10, # Only solve every nth image
Expand Down Expand Up @@ -214,6 +214,7 @@
'west_clutch_dec_correction': 0.0, #
'east_flip_ra_correction': 0.0, #
'east_flip_dec_correction': 0.0, # #
'home_after_unpark' : True,
'permissive_mount_reset' : 'yes', # if this is set to yes, it will reset the mount at startup and when coordinates are out significantly
'settings': {
'latitude_offset': 0.0, #Decimal degrees, North is Positive These *could* be slightly different than site.
Expand Down Expand Up @@ -403,28 +404,27 @@
#"driver": "Maxim.Image", #"LCO.dual", # 'ASCOM.FLI.FilterWheel',
'ip_string': None,
"dual_wheel": False,
"default_flat_exposure" : 1.0,
'settings': {
'filter_count': 11, # This must be correct as to the number of filters
'home_filter': 0,
'home_filter': 4,
'default_filter': "pr",
'filter_list': ['focus','pr','pg','pb','ha','o3','s2', 'air'], # A list of actual physical filters for the substitution function
'filter_reference': 0, # We choose to use W as the default filter. Gains taken at F9, Ceravolo 300mm
'filter_data': [['filter', 'filter_index', 'filter_offset', 'sky_gain', 'screen_gain', 'alias'], #NB NB NB add cwl & bw in nm.
'filter_reference': 4, # We choose to use W as the default filter. Gains taken at F9, Ceravolo 300mm
# Columns for filter data are : ['filter', 'filter_index', 'filter_offset', 'sky_gain', 'screen_gain', 'alias']
'filter_data': [

#['w', [0, 0], 0, 72.7, [1.00 , 72], 'PL'], #0. For sequencer autofocus consider foc or f filter
['focus', [3, 3], 0, 72.7, [1.00 , 72], 'focus'], #0.
['air', [0, 0], 0, 620, [1.00 , 72], 'PhLum'], #1.
['dark', [1, 1], 0, 170, [1.00 , 119], 'PhRed'], #2.
['pb', [2, 2], 0, 220, [1.00 , 113], 'PhGreen'], #3.
['pg', [3, 3], 0, 300, [0.80 , 97], 'PhBlue'], #4.
['pr', [4, 4], 0, 300, [0.80 , 97], 'PhBlue'], #4.
['pr', [4, 4], 0, 32, [0.80 , 97], 'PhBlue'], #4.
#['PR', [1, 1], 0, 170, [1.00 , 119], 'PhBlue'], #2.
#['PG', [2, 2], 0, 220, [1.00 , 113], 'PhGreen'], #3.
#['PB', [3, 3], 0, 300, [0.80 , 97], 'PhRed'], #4.
['ha', [5, 5], 0, .400, [5.00 , 200], 'Halpha'], #5.
['ha', [5, 5], 0, .50, [5.00 , 200], 'Halpha'], #5.
['o3', [6, 6], 0, 6, [4.00 , 200], 'OIII'], #6.
['s2', [7, 7], 0, .221, [10.0, 200], 'SII']], #7.
['s2', [7, 7], 0, .2, [10.0, 200], 'SII']], #7.
#['air', [7, 7], -1000, 100., [1.00, 70], 'air'], #8.
#['gooble', [6, 6], 0, .221, [ 0, 0], 'dark'], #9.
#['LRGB', [0, 0], 0, .221, [ 0, 0], 'LRGB']], #10.
Expand All @@ -433,7 +433,7 @@
'filter_screen_sort': [1, 4, 3, 2, 6, 5, 7], # don't use narrow yet, 8, 10, 9], useless to try.


'filter_sky_sort': [6, 4, 5, 1, 2, 3, 0] #No diffuser based filters
'filter_sky_sort': [8, 7, 6, 3, 4, 5, 1] #No diffuser based filters
#'filter_sky_sort': [7, 19, 2, 13, 18, 5, 15,\
# 12, 4, 11, 16, 10, 9, 17, 3, 14, 1, 0] #basically no diffuser based filters
#[32, 8, 22, 21, 20, 23, 31, 6, 7, 19, 27, 2, 37, 13, 18, 30, 5, 15, 36, 12,\
Expand Down Expand Up @@ -497,8 +497,9 @@
'corner_everlap': True,
'x_bias_line': True,
'y_bias_line': True,
'ref_dark': 60.0,
'long_dark': 600.0,
#'ref_dark': 60.0,
#'long_dark': 600.0,

'x_active': 4500,
'y_active': 3600,
#THIS IS ALL WRONG!
Expand All @@ -513,8 +514,8 @@
'pix_scale': [0.269,0.538],
'CameraXSize' : 4096,
'CameraYSize' : 4096,
'MaxBinX' : 2,
'MaxBinY' : 2,
#'MaxBinX' : 4,
#'MaxBinY' : 4,
'StartX' : 1,
'StartY' : 1,

Expand All @@ -525,16 +526,12 @@
'north_offset': 0.0, # These three are normally 0.0 for the primary telescope
'east_offset': 0.0, # Not sure why these three are even here.
'rotation': 0.0, # Probably remove.
'min_exposure': 0.2,
'min_exposure': 0.1,
'max_exposure': 3600,
'can_subframe': True,
'min_subframe': [128, 128],
'bin_modes': [[1, 1, 0.269],[2, 2, 0.538]], # , [2, 2, 2.13], [3, 3, 3.21], [4, 4, 4.27]], #Meaning no binning choice if list has only one entry, default should be first.
'default_bin': [2, 2, 0.538], # Matched to seeing situation by owner
'maximum_bin': [1, 1, 0.269], # Matched to seeing situation by owner
'cosmics_at_default' : 'yes',
'cosmics_at_maximum' : 'yes',
'bin_enable': ['1 1', '2 2'],


'cycle_time': [2, 2, 2, 2], # 3x3 requires a 1, 1 reaout then a software bin, so slower.
'rbi_delay': 0., # This being zero says RBI is not available, eg. for SBIG.
'is_cmos': False,
Expand All @@ -559,7 +556,19 @@
'areas_implemented': ["Full",'4x4d', "600%", "500%", "450%", "300%", "220%", "150%", "133%", "Full", "Sqr", '71%', '50%', '35%', '25%', '12%'],
'default_area': "Full",
'default_rotation': 0.0000,
'flat_bin_spec': ['1,1','2 2'], #Default binning for flats
'flat_bin_spec': ['1,1','2,2', '3,3','4,4'], #Default binning for flats
#'darkbias_bin_spec': ['1,1','2,2', '3,3','4,4'], #Default binning for flats
'darkbias_bin_spec': ['1,1', '2,2','3,3','4,4'], #Default binning for flats
'bin_enable': ['1,1', '2,2', '3,3','4,4'],
'default_bin': [2, 2, 0.538], # Matched to seeing situation by owner
'maximum_bin': [1, 1, 0.269], # Matched to seeing situation by owner
'bin_modes': [[1, 1, 0.269],[2, 2, 0.538]], # , [2, 2, 2.13], [3, 3, 3.21], [4, 4, 4.27]], #Meaning no binning choice if list has only one entry, default should be first.

'cosmics_at_default' : 'yes',
'cosmics_at_maximum' : 'yes',
'dark_length' : 10,
'bias_count' : 2,
'dark_count' : 2,
'has_darkslide': False,
'darkslide_com': None,
'shutter_type': "Electronic",
Expand Down
18 changes: 12 additions & 6 deletions configs/mr2/site_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@
'east_flip_dec_correction': 0.0,
'west_clutch_ra_correction': 0.0,
'west_clutch_dec_correction': 0.0,
'home_after_unpark' : False,
'has_paddle': False, #or a string that permits proper configuration.
'has_ascom_altaz': True,
'pointing_tel': 'tel1', #This can be changed to 'tel2' by user. This establishes a default.
Expand Down Expand Up @@ -500,7 +501,7 @@
'home_filter': 1,
'filter_reference': 1,
'default_filter': 'w',
'filter_data': [['filter', 'filter_index', 'filter_offset', 'sky_gain', 'screen_gain', 'abbreviation'],
'filter_data': [
['air', [0, 0], -1000, 0.01, [2, 17], 'ai'], # 0
['Lum', [1, 0], 0, 0.01, [2, 17], 'w '], # 20
['Red', [0, 4], 0, 0.01, [2, 17], 'r '], # 21 ['JV (Grn)', [0, 3], 0, 0.01, [2, 17], 'V '], # 9
Expand Down Expand Up @@ -582,8 +583,8 @@
'y_chip': 4117,
'CameraXSize' : 4132,
'CameraYSize' : 4117,
'MaxBinX' : 2,
'MaxBinY' : 2,
#'MaxBinX' : 2,
#'MaxBinY' : 2,
'StartX' : 1,
'StartY' : 1,
'x_pixel': 9.0,
Expand Down Expand Up @@ -617,7 +618,7 @@
'maximum_bin': [1, 1, 0.469], # Matched to seeing situation by owner
'cosmics_at_default' : 'no',
'cosmics_at_maximum' : 'yes',
'bin_enable': ['2 2'],

'cycle_time': [10, 12, 8, 6], # 3x3 requires a 1, 1 reaout then a software bin, so slower.
'rbi_delay': 0., # This being zero says RBI is not available, eg. for SBIG.
'is_cmos': False,
Expand All @@ -637,16 +638,21 @@
'areas_implemented': ["600%", "300%", "220%", "150%", "Full", "Sqr", '71%', '50%', '35%', '25%', '12%'],
'default_area': "Full",
'default_rotation': 0.0000,
'flat_bin_spec': '1,1', #Default binning for flats
'smart_stack_exposure_time': 30,
#'bin_modes': [[2, 2, 0.9371], [1, 1, 0.4685], [3, 3, 1.4056], [4, 4, 1.8742]], #Meaning no binning if list has only one entry
#'default_bin': [2, 2], #Always square and matched to seeing situation by owner
#'cycle_time': [18, 15, 12, 9], # 3x3 requires a 1, 1 reaout then a software bin, so slower.
'has_darkslide': False,
'darkslide_com': None,
'shutter_type': "Electronic",
'flat_bin_spec': ['1,1','2,2', '3,3','4,4'], #Default binning for flats
'darkbias_bin_spec': ['1,1','2,2', '3,3','4,4'], #Default binning for flats
'bin_enable': ['1,1', '2,2', '3,3','4,4'],
'dark_length' : 900,
'bias_count' : 10,
'dark_count' : 10,


'flat_bin_spec': ['1,1', '2 2'], # List of binnings for flats
'has_screen': True,
'screen_settings': {
'screen_saturation': 157.0,
Expand Down
Loading

0 comments on commit 86edd37

Please sign in to comment.