Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moving sp1k4 and im5k4 camera sync into daq #28

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Conversation

tongju12
Copy link
Contributor

@tongju12 tongju12 commented Apr 5, 2024

James wants to move IM5K4 and SP1K4 camera sync PV into daq in alarm system

@tongju12 tongju12 requested a review from ZLLentz April 5, 2024 17:39
Comment on lines 89 to 93
,,SP1K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,
,,SP1K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,
1,IM5K4
,,IM5K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,
,,IM5K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Each line should have exactly 7 commas or the parser breaks

Suggested change
,,SP1K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,
,,SP1K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,
1,IM5K4
,,IM5K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,
,,IM5K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,
,,SP1K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,,
,,SP1K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,,
1,IM5K4,,,,,,
,,IM5K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,,
,,IM5K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Zach. I fix it. It is strange that all previous PV has less comma. But I fixed those according to your suggestion.

Comment on lines 89 to 93
,,SP1K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,,
,,SP1K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,,
1,IM5K4,,,,,,
,,IM5K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,,
,,IM5K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,,
Copy link
Member

@ZLLentz ZLLentz Apr 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I miscounted, only the IM5K4 line needed an adjustment previously

Suggested change
,,SP1K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,,
,,SP1K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,,
1,IM5K4,,,,,,
,,IM5K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,,
,,IM5K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,,
,,SP1K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,
,,SP1K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,
1,IM5K4,,,,,,
,,IM5K4:PPM:CAM:TSS:SyncStatus,Camera Sync Status,,,,
,,IM5K4:PPM:CAM:TSS:DiffVsIntAvg,Sync Diff,,,,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated again, Zach.

@ZLLentz
Copy link
Member

ZLLentz commented Apr 10, 2024

All checks passed, marking as ready and merging!

@ZLLentz ZLLentz marked this pull request as ready for review April 10, 2024 21:20
@ZLLentz ZLLentz merged commit 37ac0b4 into pcdshub:master Apr 10, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants