Skip to content

Commit a836780

Browse files
committed
Merge branch 'main' into 59_jf-rotation
2 parents a1d1cc2 + f85bc17 commit a836780

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

src/components/FixedTarget/PumpProbeComponents.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ import { calculateEAVA, EavaRequest } from "../params";
1818
* Opens a dilog showing the calculated laser delay to set for each EAVA setting, given the laser
1919
* exposure time and collection exposure time.
2020
*
21-
* @param {number} laserDwell - laser exposure time
22-
* @param {number} expTime - collection exposure time
21+
* @param {EavaRequest} props - parameters for EAVA calculation: laser exposure time and exposure time (in s)
2322
*/
2423
export function PumpProbeDialog(props: EavaRequest) {
2524
const [open, setOpen] = React.useState(false);

src/components/params.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export const pumpProbeMode = [
1515
];
1616

1717
export type EavaRequest = {
18-
laserDwell: number;
19-
expTime: number;
18+
laserDwell: number; // Laser exposure time, in s
19+
expTime: number; // Collection exposure time, in s
2020
};
2121

2222
/**

src/screens/OavMover.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,13 @@ export function CoordinateSystem() {
261261
setOpen(false);
262262
};
263263

264-
const buttonStyle = {
265-
color: "white",
266-
padding: "12px",
267-
backgroundColor: "#1c2025",
268-
width: "100%",
269-
height: "85%",
270-
};
264+
// const buttonStyle = {
265+
// color: "white",
266+
// padding: "12px",
267+
// backgroundColor: "#1c2025",
268+
// width: "100%",
269+
// height: "85%",
270+
// };
271271

272272
return (
273273
<>

0 commit comments

Comments
 (0)