Code

Making NYX Dewar 8x3#350

Code

Open

NYSBC-Rudra wants to merge 126 commits intoNSLS2:md2NSLS2/lsdc:md2from NYSBC-Rudra:larger_dewarNYSBC-Rudra/lsdc:larger_dewarCopy head branch name to clipboard

+13-13

Commits

Commits on Feb 1, 2023

• change call for insertRasterResult to allow remote call

  JunAishima

  committed
  af3590c

• send insertRasterResult() call to server

  JunAishima

  committed
  5451785

• remove ispybLib requirement from GUI

  JunAishima

  committed
  698d8b3

• fix string output so literals are surrounded with single quotes

  JunAishima

  committed
  0b7f386

Commits on Apr 5, 2023

• no dzdo necessary if all LSDC servers are run by service user

  JunAishima

  committed
  f23c86f

• check that an lsdc service user is running the script

  Show description for bfe2103
  JunAishima

  committed
  bfe2103

Commits on May 4, 2023

• Commenting out light brightness button until PVs are fixed

  vshekar

  committed
  7ae433a

• Disabling brighter and dimmer buttons until PV is fixed

  vshekar

  committed
  2f5224a

Commits on May 6, 2023

• Fixes:

  Show description for b7ab8c2
  vshekar

  committed
  b7ab8c2

• Ran black formatter

  vshekar

  committed
  baa1d1a

Commits on May 8, 2023

• Increased sleep time after loading hdf5 file from 0.3 to 0.5

  Show description for 8f4ab1c
  vshekar

  committed
  8f4ab1c

• Merge branch 'lifetime-fixes' of https://github.com/vshekar/lsdc into lifetime-fixes

  vshekar

  committed
  23648c2

• Update control_main.py

  Show description for 7a3c097
  vshekar

  authored
  7a3c097

• Merge pull request NSLS2#291 from vshekar/remove-light-buttons

  Show description for 978159d
  vshekar

  authored
  978159d

• Merge branch 'master' into lifetime-fixes

  vshekar

  authored
  1fa9fdf

• Merge pull request NSLS2#292 from vshekar/lifetime-fixes

  Show description for a99e762
  vshekar

  authored
  a99e762

Commits on May 11, 2023

• calcLifetime triggers when osc range is edited

  vshekar

  committed
  da7090d

Commits on May 12, 2023

• Merge pull request NSLS2#293 from vshekar/lifetime-fixes-update

  Show description for ae6b4e3
  JunAishima

  authored
  ae6b4e3

Commits on May 19, 2023

• Fixed a case where multiple users write to the same raddose output

  vshekar

  committed
  73f091e

Commits on May 25, 2023

• Fixed wrong parameters passed to mount function when retrying after error

  vshekar

  committed
  7cebe93

Commits on Jun 15, 2023

• Added code to save FMX flux reference after setE

  Show description for 67544e5
  vshekar

  committed
  67544e5

Commits on Jun 26, 2023

• all server and GUI instances will be run from lsdc_<tla>_prod

  Show description for deec178
  JunAishima

  committed
  deec178

Commits on Jun 27, 2023

• Merge pull request NSLS2#299 from JunAishima/centralize-collection-directory

  Show description for 2334267
  JunAishima

  authored
  2334267

• add current LSDC service users, check current user against them

  Show description for be9ddd0
  JunAishima

  committed
  be9ddd0

Commits on Jun 29, 2023

• use subprocess.Popen which has the cwd kwarg

  Show description for 4c8c30d
  JunAishima

  committed
  4c8c30d

• Reading lines of subprocess.Popen()

  vshekar

  committed
  29e5c7e

• Using subprocess.run() instead of subprocess.Popen() in topview.py

  vshekar

  committed
  4f424d8

• Merge pull request NSLS2#304 from JunAishima/fix-popen-cwd

  Show description for 6a12eae
  JunAishima

  authored
  6a12eae

• Added fixes to make bluesky plan work

  vshekar

  committed
  74081de

Commits on Jun 30, 2023

• Merge pull request NSLS2#301 from NSLS-II/update-lsdc-prod-location

  Show description for e3b10b0
  JunAishima

  authored
  e3b10b0

• Merge pull request NSLS2#282 from JunAishima/service-user-2023-1

  Show description for 355b38b
  JunAishima

  authored
  355b38b

• Merge remote-tracking branch 'origin/one-branch-to-rule-them-all'

  JunAishima

  committed
  df311bf

• Merge branch 'master' into 2023-2-amxfmx

  JunAishima

  committed
  0dcba83

• Merge branch 'master' into one-branch-to-rule-them-all

  JunAishima

  authored
  7a963d6

• Merge pull request NSLS2#307 from NSLS-II/one-branch-to-rule-them-all

  Show description for 4d069dd
  JunAishima

  authored
  4d069dd

• Merge branch 'master' into 2023-2-amxfmx

  JunAishima

  committed
  a3698d0

• Merge pull request NSLS2#308 from JunAishima/2023-2-amxfmx

  Show description for 2823afc
  JunAishima

  authored
  2823afc

Commits on Jul 6, 2023

• remove homing pins after sample mount on FMX

  Show description for b397f72
  JunAishima

  committed
  b397f72

• remove commented-out code for homing pins on FMX

  JunAishima

  committed
  6a74183

• move omega to 0 before SA->SE on FMX

  Show description for 5f219dc
  JunAishima

  committed
  5f219dc

Commits on Jul 19, 2023

• Merge branch 'one-branch-to-rule-them-all' into remove-ispyblib-from-gui

  JunAishima

  authored
  9a54800

• re-do commits removed after merging gui modularization

  JunAishima

  committed
  e483951

Commits on Jul 21, 2023

• Removed hard coded return statements to properly return robot failures

  vshekar

  committed
  4bc82c0

• Removed unecessary assignment

  vshekar

  committed
  64425a2

Commits on Jul 25, 2023

• Revert "comment out ISPyB calls to database"

  Show description for b89c788
  JunAishima

  committed
  b89c788

• Revert "fix for proposal name while ISPyB is down"

  Show description for 3ee4228
  JunAishima

  committed
  3ee4228

• use config from /etc/ispyb

  JunAishima

  committed
  e736700

• use mysql connector object from ISPyB connection

  JunAishima

  committed
  f3653ae

• fix missing parenthesis

  JunAishima

  committed
  f1fd622

• Merge pull request NSLS2#318 from vshekar/robot-fixes

  Show description for df11338
  danielballan

  authored
  df11338

Commits on Jul 26, 2023

• Merge pull request NSLS2#319 from JunAishima/re-enable-ispyb

  Show description for d173a6b
  JunAishima

  authored
  d173a6b

• Merge branch '2023-2-amxfmx' into remove-ispyblib-from-gui

  JunAishima

  authored
  b7bce67

• Merge pull request NSLS2#317 from JunAishima/remove-ispyblib-from-gui

  Show description for 132306c
  JunAishima

  authored
  132306c

Commits on Jul 31, 2023

• Merge pull request NSLS2#310 from JunAishima/small-fixes-2023-07-06

  Show description for 36ce2fa
  JunAishima

  authored
  36ce2fa

Commits on Aug 7, 2023

• Revert "all server and GUI instances will be run from lsdc_<tla>_prod"

  Show description for 19ddc5b
  JunAishima

  committed
  19ddc5b

Commits on Aug 9, 2023

• Merge pull request NSLS2#296 from vshekar/retry-mount-fix

  Show description for 2b429ce
  JunAishima

  authored
  2b429ce

Commits on Aug 14, 2023

• initial release notes

  JunAishima

  committed
  41d7517

Commits on Aug 16, 2023

• Merge pull request NSLS2#322 from JunAishima/revert-running-lsdc-in-lsdc-tla-prod

  Show description for d0bb07b
  JunAishima

  authored
  d0bb07b

Commits on Sep 8, 2023

• Removed replaceLine function

  Show description for 97eb6f0
  vshekar

  committed
  97eb6f0

• Cleanup and formatting

  vshekar

  committed
  26d3de0

• Merge pull request NSLS2#295 from vshekar/lifetime-fixes

  Show description for 43ac2f2
  JunAishima

  authored
  43ac2f2

Commits on Sep 11, 2023

• Corrected docstring for fmx_flux_reference

  vshekar

  committed
  323d1c8

• Merge pull request NSLS2#300 from vshekar/setE-cleanup

  Show description for 4865dff
  JunAishima

  authored
  4865dff

• further updates to release notes

  Show description for ad16669
  JunAishima

  committed
  ad16669

• remove redundant line about FMX robot mount code changes

  JunAishima

  committed
  8e43bcb

Commits on Sep 12, 2023

• Merge pull request NSLS2#325 from NSLS-II/2023-2-amxfmx

  Show description for 8710eab
  JunAishima

  authored
  8710eab

• Merge pull request NSLS2#323 from JunAishima/release-notes-2023-3

  Show description for 9291de4
  JunAishima

  authored
  9291de4

Commits on Sep 14, 2023

• fix ISPyB processing population error

  Show description for 44ad6a4
  JunAishima

  committed
  44ad6a4

• store last 255 characters of processing call

  Show description for d550b92
  JunAishima

  committed
  d550b92

Commits on Sep 15, 2023

• Refactored refresh dewartree view:

  Show description for 5938511
  vshekar

  committed
  5938511

• Set datapath during request creation to come from blconfig

  vshekar

  committed
  a8fef96

Commits on Sep 19, 2023

• Minimum working example for showing puck info

  vshekar

  committed
  fd7310a

Commits on Sep 25, 2023

• comment out ISPyB calls to database

  Show description for e0d07dd
  JunAishima

  committed
  e0d07dd

• fix for proposal name while ISPyB is down

  Show description for 4516e17
  JunAishima

  committed
  4516e17

Commits on Sep 26, 2023

• restore setting visit name

  Show description for 7d1581a
  JunAishima

  committed
  7d1581a

• calcLifetimeCB is only calculated if fmx

  vshekar

  committed
  e58a4a3

Commits on Sep 27, 2023

• Merge pull request NSLS2#327 from vshekar/datapath-fix

  Show description for b6dbc58
  JunAishima

  authored
  b6dbc58

• Merge pull request NSLS2#331 from vshekar/2023-3-amxfmx

  Show description for bac1b32
  JunAishima

  authored
  bac1b32

• Merge pull request NSLS2#330 from JunAishima/re-disable-ispyb-2023-3

  Show description for 47c98ac
  JunAishima

  authored
  47c98ac

• Merge branch 'master' into 2023-3-amxfmx

  JunAishima

  committed
  248c920

Commits on Sep 28, 2023

• Merge pull request NSLS2#332 from JunAishima/2023-3-amxfmx

  Show description for 239fc4c
  vshekar

  authored
  239fc4c

Commits on Sep 29, 2023

• hard code ISPyB DC ID for fastDP processing

  Show description for 04cd2d8
  JunAishima

  committed
  04cd2d8

Commits on Oct 2, 2023

• use Pillow on server to resize crystal snapshot

  JunAishima

  committed
  8c58596

• Added env variable healthcheck

  vshekar

  committed
  e0f74ee

• Checks if user is proposal member or staff

  vshekar

  committed
  ed862b9

• Attempting to add proposal number to puck label

  vshekar

  committed
  0c06632

• Merge pull request NSLS2#329 from vshekar/puck-visibility

  Show description for 7be5165
  JunAishima

  authored
  7be5165

Commits on Oct 3, 2023

• Merge pull request NSLS2#333 from JunAishima/2023-3-amxfmx

  Show description for 151a71f
  JunAishima

  authored
  151a71f

• fix logging message - show both ratio and filename

  JunAishima

  committed
  3571780

• fix missing import

  JunAishima

  committed
  d482745

Commits on Oct 13, 2023

• Added single call to get all dewar data

  vshekar

  committed
  3d7c924

Commits on Oct 16, 2023

• fix typo

  JunAishima

  committed
  5a17f0c

• Merge pull request NSLS2#326 from JunAishima/2023-3-amxfmx-ispyb-processing

  Show description for 3f07c6c
  JunAishima

  authored
  3f07c6c

• Merge pull request NSLS2#335 from JunAishima/fix-ispyb-snapshot-resize

  Show description for 4116872
  JunAishima

  authored
  4116872

• Merge pull request NSLS2#338 from vshekar/dewar-tree-faster-refresh

  Show description for a5bd381
  JunAishima

  authored
  a5bd381

Commits on Oct 18, 2023

• Fixed displaying puck name with proposal number

  vshekar

  committed
  5e23a43

Commits on Oct 19, 2023

• Added formatting to proposal id

  vshekar

  committed
  060b810

Commits on Oct 24, 2023

• Merge pull request NSLS2#339 from vshekar/dewar-tree-puckname-fix

  Show description for f81b72d
  vshekar

  authored
  f81b72d

Commits on Nov 2, 2023

• merge conflicts

  NYSBC-Rudra

  committed
  8f2a178

• adding to dewar dialog

  NYSBC-Rudra

  committed
  5b486be

• changin dewar dialog

  NYSBC-Rudra

  committed
  ff17926

Commits on Nov 7, 2023

• changing control_main

  NYSBC-Rudra

  committed
  05b85be

• Merge branch 'master' into new_md2

  NYSBC-Rudra

  authored
  c3a5c32

• Merge pull request #1 from NYSBC-Rudra/new_md2

  Show description for 12fe082
  NYSBC-Rudra

  authored
  12fe082

Commits on Nov 8, 2023

• Fixing branch

  NYSBC-Rudra

  committed
  20ee8c0

• Merge pull request #2 from NYSBC-Rudra/dewar_edits

  Show description for d10b8bf
  NYSBC-Rudra

  authored
  d10b8bf

• Adding resolution drop down to file menu

  Show description for 1ec7ed5
  NYSBC-Rudra

  committed
  1ec7ed5

Commits on Nov 9, 2023

• adding gui folder to master

  NYSBC-Rudra

  committed
  9233638

Commits on Nov 13, 2023

• changing r value edits

  NYSBC-Rudra

  committed
  498ee84

• Replaced python calls with json

  vshekar

  committed
  5e7a846

• Removed code formatting in daq_main_common

  vshekar

  committed
  a3bde35

Commits on Nov 14, 2023

• Using send_to_server to directly send messages

  vshekar

  committed
  d7b529b

• Removed missing import

  vshekar

  committed
  472310b

• Better exception handling

  vshekar

  committed
  79071fe

• Merge branch 'jsonize-server-comm' of https://github.com/vshekar/lsdc into jsonize-server-comm

  vshekar

  committed
  eda6414

• making changes

  Show description for 6a35029
  NYSBC-Rudra

  committed
  6a35029

• Removed unecessary generate_server_message

  vshekar

  committed
  7a4e958

Commits on Nov 15, 2023

• Fixed bug where setTrans was passing an extra arg

  vshekar

  committed
  21acc7f

Commits on Nov 21, 2023

• updating error

  NYSBC-Rudra

  committed
  93e8107

• Merge pull request #3 from NYSBC-Rudra/resolutioncalc_dropdown

  Show description for f6586e5
  NYSBC-Rudra

  authored
  f6586e5

• Merge branch 'master' into larger_dewar

  NYSBC-Rudra

  committed
  0bb315b

• adding devices

  NYSBC-Rudra

  committed
  3ad95f4

• Merge pull request NSLS2#346 from vshekar/jsonize-server-comm

  Show description for 6d644da
  vshekar

  authored
  6d644da

Commits on Dec 4, 2023

• fixing dewar

  NYSBC-Rudra

  committed
  b61960d

• Merge branch 'larger_dewar' of https://github.com/NYSBC-Rudra/lsdc into larger_dewar

  NYSBC-Rudra

  committed
  306c6fe

• in line with md2

  NYSBC-Rudra

  committed
  44c5bf2