Skip to content

Commit

Permalink
Add new pointing model adjustment parameters to OnlinePointingModel s…
Browse files Browse the repository at this point in the history
…tructure
  • Loading branch information
arahlin committed Nov 19, 2023
1 parent 0a56335 commit 6f75e5a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
13 changes: 10 additions & 3 deletions gcp/python/ARCExtractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,16 @@ def UnpackTrackerPointingData(f):
f['TrackerPointing'] = t

p = core.G3MapVectorDouble()
p['tilts'] = np.asarray(board['tilts'], dtype=np.double)
p['flexure'] = np.asarray(board['flexure'], dtype=np.double)
p['fixedCollimation'] = np.asarray(board['fixedCollimation'], dtype=np.double)

# core model parameters
for k in ["tilts", "flexure", "fixedCollimation"]:
p[k] = np.asarray(board[k], dtype=np.double)
kadj = k + "Adjust"
if kadj in board.keys():
p[kadj] = np.asarray(board[kadj], dtype=np.double)
else:
p[kadj] = np.zeros_like(p[k])

p['time'] = np.asarray(t.time, dtype=np.double)
if 'linear_sensor_enabled' in board.keys():
p['linsensEnabled'] = np.asarray(board['linear_sensor_enabled'][0], dtype=np.double)
Expand Down
7 changes: 7 additions & 0 deletions gcp/python/InfluxDB.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,13 @@ def build_field_list(fr):
'flexure_cos': ['OnlinePointingModel', 'flexure', 1, U.deg],
'fixed_collimation_x': ['OnlinePointingModel', 'fixedCollimation', 0, U.deg],
'fixed_collimation_y': ['OnlinePointingModel', 'fixedCollimation', 1, U.deg],
'tilts_hr_angle_adjust': ['OnlinePointingModel', 'tiltsAdjust', 0, U.deg],
'tilts_lat_adjust': ['OnlinePointingModel', 'tiltsAdjust', 1, U.deg],
'tilts_el_adjust': ['OnlinePointingModel', 'tiltsAdjust', 2, U.deg],
'flexure_sin_adjust': ['OnlinePointingModel', 'flexureAdjust', 0, U.deg],
'flexure_cos_adjust': ['OnlinePointingModel', 'flexureAdjust', 1, U.deg],
'fixed_collimation_x_adjust': ['OnlinePointingModel', 'fixedCollimationAdjust', 0, U.deg],
'fixed_collimation_y_adjust': ['OnlinePointingModel', 'fixedCollimationAdjust', 1, U.deg],
'linsens_coeff_az': ['OnlinePointingModel', 'linsensCoeffs', 0, None],
'linsens_coeff_el': ['OnlinePointingModel', 'linsensCoeffs', 1, None],
'linsens_coeff_et': ['OnlinePointingModel', 'linsensCoeffs', 2, None],
Expand Down

0 comments on commit 6f75e5a

Please sign in to comment.