Skip to content

Commit

Permalink
Merge pull request #383 from lsst-ts/tickets/LOVE-41
Browse files Browse the repository at this point in the history 
Fix some issues with MTM1M3
  • Loading branch information
@sebastian-aranda
sebastian-aranda authored Jul 18, 2022
2 parents a9c97a0 + ae3b0f0 commit 0ad988b
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 92 deletions.
16 changes: 10 additions & 6 deletions love/src/components/MainTel/M1M3/M1M3.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import * as d3 from 'd3';
import _ from 'lodash';
import lodash from 'lodash';
import { defaultNumberFormatter } from 'Utils';
import {
M1M3ActuatorPositions,
Expand Down Expand Up @@ -330,20 +330,20 @@ export default class M1M3 extends Component {

if (
this.state.selectedForceParameter !== prevState.selectedForceParameter ||
this.props[this.state.selectedForceInput] !== prevProps[this.state.selectedForceInput]
!lodash.isEqual(this.props[this.state.selectedForceInput], prevProps[this.state.selectedForceInput])
) {
const forceData = this.props[this.state.selectedForceInput]?.[this.state.selectedForceParameter]?.value ?? [];
this.setState({ actuatorsForce: forceData });
}

if (!_.isEqual(this.state.actuators, prevState.actuators)) {
if (!lodash.isEqual(this.state.actuators, prevState.actuators)) {
const data = this.state.actuators.map(
(act) => Math.sqrt(act.position[0] ** 2 + act.position[1] ** 2) / this.state.maxRadius,
);
this.createColorScale(data);
}

if (!_.isEqual(this.state.actuatorsForce, prevState.actuatorsForce)) {
if (!lodash.isEqual(this.state.actuatorsForce, prevState.actuatorsForce)) {
this.createColorScale(this.state.actuatorsForce);
}

Expand All @@ -352,7 +352,7 @@ export default class M1M3 extends Component {
prevProps.xPosition !== xPosition ||
prevProps.yPosition !== yPosition ||
prevProps.zPosition !== zPosition ||
!_.isEqual(prevProps.actuatorReferenceId, actuatorReferenceId)
!lodash.isEqual(prevProps.actuatorReferenceId, actuatorReferenceId)
) {
const actuators = M1M3.getActuatorsPositions(actuatorReferenceId, { xPosition, yPosition, zPosition });
// const actuators = M1M3ActuatorPositions; // Old implementation
Expand Down Expand Up @@ -464,7 +464,11 @@ export default class M1M3 extends Component {
<div className={styles.control}>
<span>Show actuators ID:</span>
<div className={styles.toggleContainer}>
<Toggle labels={['Yes', 'No']} isLive={this.state.showActuatorsID} setLiveMode={this.toggleActuatorsID} />
<Toggle
labels={['Yes', 'No']}
isLive={this.state.showActuatorsID}
setLiveMode={this.toggleActuatorsID}
/>
</div>
</div>
<div className={styles.control}>
Expand Down
150 changes: 64 additions & 86 deletions love/src/redux/selectors/selectors.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export const getLastSALCommand = (state) => {
return state.ws.lastSALCommand;
};

// MTM1M3 selectors
export const getM1M3ActuatorsState = (state) => {
const subscriptions = [
'telemetry-MTM1M3-0-forceActuatorData',
Expand Down Expand Up @@ -136,8 +137,8 @@ export const getM1M3HardpointActuatorState = (state) => {
const subscriptions = ['event-MTM1M3-0-hardpointActuatorState'];
const m1m3Data = getStreamsData(state, subscriptions);
return {
hardpointIlcState: [0, 0, 1, 1, 1, 1], // m1m3Data['event-MTM1M3-0-hardpointActuatorState']?.[0]?.ilcState?.value ?? [],
hardpointMotionState: [0, 1, 2, 3, 4, 1], // m1m3Data['event-MTM1M3-0-hardpointActuatorState']?.[0]?.motionState?.value ?? [],
hardpointIlcState: m1m3Data['event-MTM1M3-0-hardpointActuatorState']?.[0]?.ilcState?.value ?? [],
hardpointMotionState: m1m3Data['event-MTM1M3-0-hardpointActuatorState']?.[0]?.motionState?.value ?? [],
hardpointReferenceId: [1, 2, 3, 4, 5, 6],
};
};
Expand Down Expand Up @@ -189,6 +190,54 @@ export const getM1M3State = (state) => {
};
};

export const getM1M3ActuatorForces = (state) => {
const subscriptions = [
'event-MTM1M3-0-appliedAberrationForces',
'event-MTM1M3-0-appliedAccelerationForces',
'event-MTM1M3-0-appliedActiveOpticForces',
'event-MTM1M3-0-appliedAzimuthForces',
'event-MTM1M3-0-appliedBalanceForces',
'event-MTM1M3-0-appliedCylinderForces',
'event-MTM1M3-0-appliedElevationForces',
'event-MTM1M3-0-appliedForces',
'event-MTM1M3-0-appliedOffsetForces',
'event-MTM1M3-0-appliedStaticForces',
'event-MTM1M3-0-appliedThermalForces',
'event-MTM1M3-0-appliedVelocityForces',
'event-MTM1M3-0-preclippedAberrationForces',
'event-MTM1M3-0-preclippedAccelerationForces',
'event-MTM1M3-0-preclippedActiveOpticForces',
'event-MTM1M3-0-preclippedAzimuthForces',
'event-MTM1M3-0-preclippedBalanceForces',
'event-MTM1M3-0-preclippedCylinderForces',
'event-MTM1M3-0-preclippedElevationForces',
'event-MTM1M3-0-preclippedForces',
'event-MTM1M3-0-preclippedOffsetForces',
'event-MTM1M3-0-preclippedStaticForces',
'event-MTM1M3-0-preclippedThermalForces',
'event-MTM1M3-0-preclippedVelocityForces',
];
const m1m3Data = getStreamsData(state, subscriptions);
return {
appliedAberrationForces: m1m3Data['event-MTM1M3-0-appliedAberrationForces']?.[0] ?? {},
appliedAccelerationForces: m1m3Data['event-MTM1M3-0-appliedAccelerationForces']?.[0] ?? {},
appliedActiveOpticForces: m1m3Data['event-MTM1M3-0-appliedActiveOpticForces']?.[0] ?? {},
appliedAzimuthForces: m1m3Data['event-MTM1M3-0-appliedAzimuthForces']?.[0] ?? {},
appliedBalanceForces: m1m3Data['event-MTM1M3-0-appliedBalanceForces']?.[0] ?? {},
appliedCylinderForces: m1m3Data['event-MTM1M3-0-appliedCylinderForces']?.[0] ?? {},
appliedElevationForces: m1m3Data['event-MTM1M3-0-appliedElevationForces']?.[0] ?? {},
appliedForces: m1m3Data['event-MTM1M3-0-appliedForces']?.[0] ?? {},
preclippedAberrationForces: m1m3Data['event-MTM1M3-0-preclippedAberrationForces']?.[0] ?? {},
preclippedAccelerationForces: m1m3Data['event-MTM1M3-0-preclippedAccelerationForces']?.[0] ?? {},
preclippedActiveOpticForces: m1m3Data['event-MTM1M3-0-preclippedActiveOpticForces']?.[0] ?? {},
preclippedAzimuthForces: m1m3Data['event-MTM1M3-0-preclippedAzimuthForces']?.[0] ?? {},
preclippedBalanceForces: m1m3Data['event-MTM1M3-0-preclippedBalanceForces']?.[0] ?? {},
preclippedCylinderForces: m1m3Data['event-MTM1M3-0-preclippedCylinderForces']?.[0] ?? {},
preclippedElevationForces: m1m3Data['event-MTM1M3-0-preclippedElevationForces']?.[0] ?? {},
preclippedForces: m1m3Data['event-MTM1M3-0-preclippedForces']?.[0] ?? {},
};
};

// MTM2 selectors
export const getM2State = (state) => {
const subscriptions = [
Expand All @@ -207,10 +256,7 @@ export const getM2State = (state) => {
};

export const getM2Inclinometer = (state) => {
const subscriptions = [
'telemetry-MTM2-0-zenithAngle',
'event-MTM2-0-inclinationTelemetrySource',
];
const subscriptions = ['telemetry-MTM2-0-zenithAngle', 'event-MTM2-0-inclinationTelemetrySource'];
const m2InclinometerData = getStreamsData(state, subscriptions);
return {
zenithAngleMeasured: m2InclinometerData['telemetry-MTM2-0-zenithAngle']?.measured?.value ?? 0,
Expand All @@ -228,34 +274,24 @@ export const getM2Actuator = (state) => {
];
const m2ActuatorsData = getStreamsData(state, subscriptions);
return {
actuatorIlcState: m2ActuatorsData['telemetry-MTM2-0-ilcData']?.status?.value ??
Array(78).fill(0),
axialActuatorSteps: m2ActuatorsData['telemetry-MTM2-0-axialActuatorSteps']?.steps?.value ??
Array(72).fill(0),
axialEncoderPositions: m2ActuatorsData['telemetry-MTM2-0-axialEncoderPositions']?.positions?.value ??
Array(72).fill(0),
tangentActuatorSteps: m2ActuatorsData['telemetry-MTM2-0-tangentActuatorSteps']?.steps?.value ??
Array(6).fill(0),
tangentEncoderPositions: m2ActuatorsData['telemetry-MTM2-0-tangentEncoderPositions']?.positions?.value ??
Array(6).fill(0),
actuatorIlcState: m2ActuatorsData['telemetry-MTM2-0-ilcData']?.status?.value ?? Array(78).fill(0),
axialActuatorSteps: m2ActuatorsData['telemetry-MTM2-0-axialActuatorSteps']?.steps?.value ?? Array(72).fill(0),
axialEncoderPositions:
m2ActuatorsData['telemetry-MTM2-0-axialEncoderPositions']?.positions?.value ?? Array(72).fill(0),
tangentActuatorSteps: m2ActuatorsData['telemetry-MTM2-0-tangentActuatorSteps']?.steps?.value ?? Array(6).fill(0),
tangentEncoderPositions:
m2ActuatorsData['telemetry-MTM2-0-tangentEncoderPositions']?.positions?.value ?? Array(6).fill(0),
};
};

export const getM2ActuatorForce = (state) => {
const subscriptions = [
'telemetry-MTM2-0-axialForce',
'telemetry-MTM2-0-tangentForce',
];
const subscriptions = ['telemetry-MTM2-0-axialForce', 'telemetry-MTM2-0-tangentForce'];
const m2ActuatorsData = getStreamsData(state, subscriptions);
return {
axialForceApplied: m2ActuatorsData['telemetry-MTM2-0-axialForce']?.applied?.value ??
Array(72).fill(0),
axialForceMeasured: m2ActuatorsData['telemetry-MTM2-0-axialForce']?.measured?.value ??
Array(72).fill(0),
tangentForceApplied: m2ActuatorsData['telemetry-MTM2-0-tangentForce']?.applied?.value ??
Array(6).fill(0),
tangentForceMeasured: m2ActuatorsData['telemetry-MTM2-0-tangentForce']?.measured?.value ??
Array(6).fill(0),
axialForceApplied: m2ActuatorsData['telemetry-MTM2-0-axialForce']?.applied?.value ?? Array(72).fill(0),
axialForceMeasured: m2ActuatorsData['telemetry-MTM2-0-axialForce']?.measured?.value ?? Array(72).fill(0),
tangentForceApplied: m2ActuatorsData['telemetry-MTM2-0-tangentForce']?.applied?.value ?? Array(6).fill(0),
tangentForceMeasured: m2ActuatorsData['telemetry-MTM2-0-tangentForce']?.measured?.value ?? Array(6).fill(0),
};
};

Expand Down Expand Up @@ -296,64 +332,6 @@ export const getM2ActuatorTable = (state) => {
};
};

function createDataRandom() {
const data = [];
for (let i = 0; i < 156; i++) {
data.push(Math.floor(Math.random() * 1000));
}
return data;
}

export const getM1M3ActuatorForces = (state) => {
const subscriptions = [
'event-MTM1M3-0-appliedAberrationForces',
'event-MTM1M3-0-appliedAccelerationForces',
'event-MTM1M3-0-appliedActiveOpticForces',
'event-MTM1M3-0-appliedAzimuthForces',
'event-MTM1M3-0-appliedBalanceForces',
'event-MTM1M3-0-appliedCylinderForces',
'event-MTM1M3-0-appliedElevationForces',
'event-MTM1M3-0-appliedForces',
'event-MTM1M3-0-appliedOffsetForces',
'event-MTM1M3-0-appliedStaticForces',
'event-MTM1M3-0-appliedThermalForces',
'event-MTM1M3-0-appliedVelocityForces',
'event-MTM1M3-0-preclippedAberrationForces',
'event-MTM1M3-0-preclippedAccelerationForces',
'event-MTM1M3-0-preclippedActiveOpticForces',
'event-MTM1M3-0-preclippedAzimuthForces',
'event-MTM1M3-0-preclippedBalanceForces',
'event-MTM1M3-0-preclippedCylinderForces',
'event-MTM1M3-0-preclippedElevationForces',
'event-MTM1M3-0-preclippedForces',
'event-MTM1M3-0-preclippedOffsetForces',
'event-MTM1M3-0-preclippedStaticForces',
'event-MTM1M3-0-preclippedThermalForces',
'event-MTM1M3-0-preclippedVelocityForces',
];
const m1m3Data = getStreamsData(state, subscriptions);
return {
appliedAberrationForces: m1m3Data['event-MTM1M3-0-appliedAberrationForces']?.[0] ?? {
zForces: { value: createDataRandom() },
},
appliedAccelerationForces: m1m3Data['event-MTM1M3-0-appliedAccelerationForces']?.[0] ?? {},
appliedActiveOpticForces: m1m3Data['event-MTM1M3-0-appliedActiveOpticForces']?.[0] ?? {},
appliedAzimuthForces: m1m3Data['event-MTM1M3-0-appliedAzimuthForces']?.[0] ?? {},
appliedBalanceForces: m1m3Data['event-MTM1M3-0-appliedBalanceForces']?.[0] ?? {},
appliedCylinderForces: m1m3Data['event-MTM1M3-0-appliedCylinderForces']?.[0] ?? {},
appliedElevationForces: m1m3Data['event-MTM1M3-0-appliedElevationForces']?.[0] ?? {},
appliedForces: m1m3Data['event-MTM1M3-0-appliedForces']?.[0] ?? {},
preclippedAberrationForces: m1m3Data['event-MTM1M3-0-preclippedAberrationForces']?.[0] ?? {},
preclippedAccelerationForces: m1m3Data['event-MTM1M3-0-preclippedAccelerationForces']?.[0] ?? {},
preclippedActiveOpticForces: m1m3Data['event-MTM1M3-0-preclippedActiveOpticForces']?.[0] ?? {},
preclippedAzimuthForces: m1m3Data['event-MTM1M3-0-preclippedAzimuthForces']?.[0] ?? {},
preclippedBalanceForces: m1m3Data['event-MTM1M3-0-preclippedBalanceForces']?.[0] ?? {},
preclippedCylinderForces: m1m3Data['event-MTM1M3-0-preclippedCylinderForces']?.[0] ?? {},
preclippedElevationForces: m1m3Data['event-MTM1M3-0-preclippedElevationForces']?.[0] ?? {},
preclippedForces: m1m3Data['event-MTM1M3-0-preclippedForces']?.[0] ?? {},
};
};

export const getDomeState = (state) => {
const domeSubscriptions = [
'telemetry-ATDome-0-position',
Expand Down

0 comments on commit 0ad988b

Please sign in to comment.