Skip to content

Commit 9c362b6

Browse files
authored
Merge pull request #386 from lsst-ts/tickets/DM-49481
DM-49481: Add projector Electrometer to ts_config_ocs
2 parents 1e5affc + f0f25a8 commit 9c362b6

File tree

3 files changed

+88
-11
lines changed

3 files changed

+88
-11
lines changed

Electrometer/v7/_base.yaml

+26-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,32 @@ instances:
5454
electrometer_type: "Keysight"
5555
electrometer_model: "B2985B"
5656
electrometer_config: {}
57+
- sal_index: 103
58+
mode: 1
59+
range: 2.0e-08
60+
tcpip:
61+
hostname: 'localhost'
62+
port: 4002
63+
timeout: 2
64+
s3_instance: "ls"
65+
fits_file_path: '/home/saluser/develop/electrometerFitsFiles'
66+
image_name_service: "http://ccs.lsst.org"
67+
filters:
68+
median: false
69+
general: false
70+
average: false
71+
sensor:
72+
brand: "Hamamatsu"
73+
model: "S2281"
74+
serial_number: "S22818D091"
75+
accessories:
76+
vsource: false
77+
temperature: false
78+
location: "Calibration Screen"
79+
integration_time: 0.1
80+
electrometer_type: "Keithley"
81+
electrometer_model: "6517b"
82+
electrometer_config: {}
5783
- sal_index: 201
5884
mode: 1
5985
range: 2.0e-08
@@ -80,4 +106,3 @@ instances:
80106
electrometer_type: "Keithley"
81107
electrometer_model: "6517b"
82108
electrometer_config: {}
83-

Electrometer/v7/_summit.yaml

+27-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,32 @@ instances:
5454
electrometer_type: "Keysight"
5555
electrometer_model: "B2985B"
5656
electrometer_config: {}
57+
- sal_index: 103
58+
mode: 1
59+
range: 2.0e-08
60+
tcpip:
61+
hostname: 'flatfield-stages.cp.lsst.org'
62+
port: 4002
63+
timeout: 2
64+
s3_instance: "cp"
65+
fits_file_path: '/home/saluser/develop/electrometerFitsFiles'
66+
image_name_service: "http://ccs.lsst.org"
67+
filters:
68+
median: false
69+
general: false
70+
average: false
71+
sensor:
72+
brand: "Hamamatsu"
73+
model: "S2281"
74+
serial_number: "S22818D091"
75+
accessories:
76+
vsource: false
77+
temperature: false
78+
location: "Calibration Screen"
79+
integration_time: 0.1
80+
electrometer_type: "Keithley"
81+
electrometer_model: "6517b"
82+
electrometer_config: {}
5783
- sal_index: 201
5884
mode: 1
5985
range: 2.0e-08
@@ -79,4 +105,4 @@ instances:
79105
integration_time: 0.1
80106
electrometer_type: "Keithley"
81107
electrometer_model: "6517b"
82-
electrometer_config: {}
108+
electrometer_config: {}

Electrometer/v7/_tucson.yaml

+35-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
# Testing of electrometer with new converter
2-
# Created on 2023-01-04
1+
# Configuration for photodiode electrometer attached to comcam cart.
2+
# Created 2023-01-04
3+
34
instances:
45
- sal_index: 101
56
mode: 1
67
range: 2.0e-08
78
tcpip:
8-
hostname: 'cbp-calElectrometer.cp.lsst.org'
9+
hostname: 'localhost'
910
port: 5024
1011
timeout: 2
11-
s3_instance: "cp"
12+
s3_instance: "tuc"
1213
fits_file_path: '/home/saluser/develop/electrometerFitsFiles'
1314
image_name_service: "http://comcam-mcm.tu.lsst.org"
1415
filters:
@@ -31,10 +32,10 @@ instances:
3132
mode: 1
3233
range: 2.0e-08
3334
tcpip:
34-
hostname: 'cbp-Electrometer.cp.lsst.org'
35+
hostname: 'localhost'
3536
port: 5024
3637
timeout: 2
37-
s3_instance: "cp"
38+
s3_instance: "tuc"
3839
fits_file_path: '/home/saluser/develop/electrometerFitsFiles'
3940
image_name_service: "http://comcam-mcm.tu.lsst.org"
4041
filters:
@@ -53,14 +54,40 @@ instances:
5354
electrometer_type: "Keysight"
5455
electrometer_model: "B2985B"
5556
electrometer_config: {}
57+
- sal_index: 103
58+
mode: 1
59+
range: 2.0e-08
60+
tcpip:
61+
hostname: 'localhost'
62+
port: 4002
63+
timeout: 2
64+
s3_instance: "tuc"
65+
fits_file_path: '/home/saluser/develop/electrometerFitsFiles'
66+
image_name_service: "http://comcam-mcm.tu.lsst.org"
67+
filters:
68+
median: false
69+
general: false
70+
average: false
71+
sensor:
72+
brand: "Hamamatsu"
73+
model: "S2281"
74+
serial_number: "S22818D091"
75+
accessories:
76+
vsource: false
77+
temperature: false
78+
location: "Calibration Screen"
79+
integration_time: 0.1
80+
electrometer_type: "Keithley"
81+
electrometer_model: "6517b"
82+
electrometer_config: {}
5683
- sal_index: 201
5784
mode: 1
5885
range: 2.0e-08
5986
tcpip:
60-
hostname: 'auxtel-electrometer.cp.lsst.org'
87+
hostname: 'localhost'
6188
port: 4001
6289
timeout: 2
63-
s3_instance: "cp"
90+
s3_instance: "tuc"
6491
fits_file_path: '/home/saluser/develop/electrometerFitsFiles'
6592
image_name_service: "http://comcam-mcm.tu.lsst.org"
6693
filters:
@@ -79,4 +106,3 @@ instances:
79106
electrometer_type: "Keithley"
80107
electrometer_model: "6517b"
81108
electrometer_config: {}
82-

0 commit comments

Comments
 (0)