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.

Sign up for GitHub

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

Jump to bottom

Making NYX Dewar 8x3 #350

Open
wants to merge 126 commits into
base: md2
Choose a base branch
from
Open

Making NYX Dewar 8x3 #350

wants to merge 126 commits into from

Conversation

NYSBC-Rudra
Copy link
Contributor

also adding different button text in dewar.py

JunAishima and others added 30 commits February 1, 2023 09:57
@JunAishima
change call for insertRasterResult to allow remote call
af3590c
@JunAishima
send insertRasterResult() call to server
5451785
@JunAishima
remove ispybLib requirement from GUI
698d8b3
@JunAishima
fix string output so literals are surrounded with single quotes
0b7f386
@JunAishima
no dzdo necessary if all LSDC servers are run by service user
f23c86f
@JunAishima
check that an lsdc service user is running the script
bfe2103 
 * ensure that a normal user isn't starting up LSDC
@vshekar
Commenting out light brightness button until PVs are fixed
7ae433a
@vshekar
Disabling brighter and dimmer buttons until PV is fixed
2f5224a
@vshekar
Fixes:
b7ab8c2 
- Lifetime calculations are updated 1 second after any change using a timer
- Vector length is only considered if the protocol is selected
- Transmission range is specific to beamline
@vshekar
Ran black formatter
baa1d1a
@vshekar
Increased sleep time after loading hdf5 file from 0.3 to 0.5
8f4ab1c 
Check if beamline is fmx before calling calcLifetime while changing protocols
@vshekar
Merge branch 'lifetime-fixes' of https://github.com/vshekar/lsdc into…
23648c2 
… lifetime-fixes
@vshekar
Update control_main.py
7a3c097 
Removed formatting
@vshekar
Merge pull request NSLS-II#291 from vshekar/remove-light-buttons
978159d 
Remove light buttons
@vshekar
Merge branch 'master' into lifetime-fixes
1fa9fdf
@vshekar
Merge pull request NSLS-II#292 from vshekar/lifetime-fixes
a99e762 
Lifetime fixes
@vshekar
calcLifetime triggers when osc range is edited
da7090d
@JunAishima
Merge pull request NSLS-II#293 from vshekar/lifetime-fixes-update
ae6b4e3 
calcLifetime triggers when osc range is edited
@vshekar
Fixed a case where multiple users write to the same raddose output
73f091e
@vshekar
Fixed wrong parameters passed to mount function when retrying after e…
7cebe93 
…rror
@vshekar
Added code to save FMX flux reference after setE
67544e5 
- Also moves to correct governor states after setE
@JunAishima
all server and GUI instances will be run from lsdc_<tla>_prod
deec178 
 * development clones of LSDC will be located at
   /nsls2/software/mx/daq/lsdc_<tla> (the original location),
   while production clones have been checked out to
   /nsls2/software/mx/daq/lsdc_<tla>_prod
@JunAishima
Merge pull request NSLS-II#299 from JunAishima/centralize-collection-…
2334267 
…directory

Centralize collection directory
@JunAishima
add current LSDC service users, check current user against them
be9ddd0 
 * more explicitly check whether current user is a known
   LSDC service user
@JunAishima
use subprocess.Popen which has the cwd kwarg
4c8c30d 
 * os.popen does not
@vshekar
Reading lines of subprocess.Popen()
29e5c7e
@vshekar
Using subprocess.run() instead of subprocess.Popen() in topview.py
4f424d8
@JunAishima
Merge pull request NSLS-II#304 from JunAishima/fix-popen-cwd
6a12eae 
use subprocess.Popen which has the cwd kwarg
@vshekar
Added fixes to make bluesky plan work
74081de
@JunAishima
Merge pull request NSLS-II#301 from NSLS-II/update-lsdc-prod-location
e3b10b0 
all production server and GUI instances will be run from lsdc_<tla>_prod
vshekar and others added 30 commits October 19, 2023 15:48
@vshekar
Added formatting to proposal id
060b810
@vshekar
Merge pull request NSLS-II#339 from vshekar/dewar-tree-puckname-fix
f81b72d 
Fixed displaying puck name with proposal number
@NYSBC-Rudra
merge conflicts
8f2a178
@NYSBC-Rudra
adding to dewar dialog
5b486be
@NYSBC-Rudra
changin dewar dialog
ff17926
@NYSBC-Rudra
changing control_main
05b85be
@NYSBC-Rudra
Merge branch 'master' into new_md2
c3a5c32
@NYSBC-Rudra
Merge pull request #1 from NYSBC-Rudra/new_md2
12fe082 
changing dewar dialog
@NYSBC-Rudra
Fixing branch
20ee8c0
@NYSBC-Rudra
Merge pull request #2 from NYSBC-Rudra/dewar_edits
d10b8bf 
Fixing branch
@NYSBC-Rudra
Adding resolution drop down to file menu
1ec7ed5 
Final for now until testing
@NYSBC-Rudra
adding gui folder to master
9233638
@NYSBC-Rudra
changing r value edits
498ee84
@vshekar
Replaced python calls with json
5e7a846
@vshekar
Removed code formatting in daq_main_common
a3bde35
@vshekar
Using send_to_server to directly send messages
d7b529b
@vshekar
Removed missing import
472310b
@vshekar
Better exception handling
79071fe
@vshekar
Merge branch 'jsonize-server-comm' of https://github.com/vshekar/lsdc …
eda6414 
…into jsonize-server-comm
@NYSBC-Rudra
making changes
6a35029 
still need to
Make new container by copying current container

db_lib.getContainerByName(db_lib.primaryDewarName, 'nyx')
Update the [‘contents’] of container to make it length of 24
Then use db_lib.updateContainer(new container)
@vshekar
Removed unecessary generate_server_message
7a4e958
@vshekar
Fixed bug where setTrans was passing an extra arg
21acc7f
@NYSBC-Rudra
updating error
93e8107
@NYSBC-Rudra
Merge pull request #3 from NYSBC-Rudra/resolutioncalc_dropdown
f6586e5 
Resolutioncalc dropdown
@NYSBC-Rudra
Merge branch 'master' into larger_dewar
0bb315b
@NYSBC-Rudra
adding devices
3ad95f4
@vshekar
Merge pull request NSLS-II#346 from vshekar/jsonize-server-comm
6d644da 
Replaced python calls with json
@NYSBC-Rudra
fixing dewar
b61960d
@NYSBC-Rudra
Merge branch 'larger_dewar' of https://github.com/NYSBC-Rudra/lsdc in…
306c6fe 
…to larger_dewar
@NYSBC-Rudra
in line with md2
44c5bf2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NYSBC-Rudra @JunAishima @vshekar @danielballan