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

Commits on Feb 1, 2023

  1. change call for insertRasterResult to allow remote call

    @JunAishima
    JunAishima committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    af3590c View commit details
    Browse the repository at this point in the history

  2. send insertRasterResult() call to server

    @JunAishima
    JunAishima committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    5451785 View commit details
    Browse the repository at this point in the history

  3. remove ispybLib requirement from GUI

    @JunAishima
    JunAishima committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    698d8b3 View commit details
    Browse the repository at this point in the history

  4. fix string output so literals are surrounded with single quotes

    @JunAishima
    JunAishima committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0b7f386 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

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

    @JunAishima
    JunAishima committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    f23c86f View commit details
    Browse the repository at this point in the history

  2. check that an lsdc service user is running the script 

     * ensure that a normal user isn't starting up LSDC
    @JunAishima
    JunAishima committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    bfe2103 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. Commenting out light brightness button until PVs are fixed

    @vshekar
    vshekar committed May 4, 2023
    Configuration menu
    Copy the full SHA
    7ae433a View commit details
    Browse the repository at this point in the history

  2. Disabling brighter and dimmer buttons until PV is fixed

    @vshekar
    vshekar committed May 4, 2023
    Configuration menu
    Copy the full SHA
    2f5224a View commit details
    Browse the repository at this point in the history

Commits on May 6, 2023

  1. Fixes: 

    - 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
    vshekar committed May 6, 2023
    Configuration menu
    Copy the full SHA
    b7ab8c2 View commit details
    Browse the repository at this point in the history

  2. Ran black formatter

    @vshekar
    vshekar committed May 6, 2023
    Configuration menu
    Copy the full SHA
    baa1d1a View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Increased sleep time after loading hdf5 file from 0.3 to 0.5 

    Check if beamline is fmx before calling calcLifetime while changing protocols
    @vshekar
    vshekar committed May 8, 2023
    Configuration menu
    Copy the full SHA
    8f4ab1c View commit details
    Browse the repository at this point in the history

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

    … lifetime-fixes
    @vshekar
    vshekar committed May 8, 2023
    Configuration menu
    Copy the full SHA
    23648c2 View commit details
    Browse the repository at this point in the history

  3. Update control_main.py 

    Removed formatting
    @vshekar
    vshekar authored May 8, 2023
    Configuration menu
    Copy the full SHA
    7a3c097 View commit details
    Browse the repository at this point in the history

  4. Merge pull request NSLS-II#291 from vshekar/remove-light-buttons 

    Remove light buttons
    @vshekar
    vshekar authored May 8, 2023
    Configuration menu
    Copy the full SHA
    978159d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into lifetime-fixes

    @vshekar
    vshekar authored May 8, 2023
    Configuration menu
    Copy the full SHA
    1fa9fdf View commit details
    Browse the repository at this point in the history

  6. Merge pull request NSLS-II#292 from vshekar/lifetime-fixes 

    Lifetime fixes
    @vshekar
    vshekar authored May 8, 2023
    Configuration menu
    Copy the full SHA
    a99e762 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. calcLifetime triggers when osc range is edited

    @vshekar
    vshekar committed May 11, 2023
    Configuration menu
    Copy the full SHA
    da7090d View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Merge pull request NSLS-II#293 from vshekar/lifetime-fixes-update 

    calcLifetime triggers when osc range is edited
    @JunAishima
    JunAishima authored May 12, 2023
    Configuration menu
    Copy the full SHA
    ae6b4e3 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

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

    @vshekar
    vshekar committed May 19, 2023
    Configuration menu
    Copy the full SHA
    73f091e View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Fixed wrong parameters passed to mount function when retrying after e… 

    …rror
    @vshekar
    vshekar committed May 25, 2023
    Configuration menu
    Copy the full SHA
    7cebe93 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Added code to save FMX flux reference after setE 

    - Also moves to correct governor states after setE
    @vshekar
    vshekar committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    67544e5 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

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

     * 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
    JunAishima committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    deec178 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge pull request NSLS-II#299 from JunAishima/centralize-collection-… 

    …directory

Centralize collection directory
    @JunAishima
    JunAishima authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    2334267 View commit details
    Browse the repository at this point in the history

  2. add current LSDC service users, check current user against them 

     * more explicitly check whether current user is a known
   LSDC service user
    @JunAishima
    JunAishima committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    be9ddd0 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. use subprocess.Popen which has the cwd kwarg 

     * os.popen does not
    @JunAishima
    JunAishima committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    4c8c30d View commit details
    Browse the repository at this point in the history

  2. Reading lines of subprocess.Popen()

    @vshekar
    vshekar committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    29e5c7e View commit details
    Browse the repository at this point in the history

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

    @vshekar
    vshekar committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    4f424d8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request NSLS-II#304 from JunAishima/fix-popen-cwd 

    use subprocess.Popen which has the cwd kwarg
    @JunAishima
    JunAishima authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    6a12eae View commit details
    Browse the repository at this point in the history

  5. Added fixes to make bluesky plan work

    @vshekar
    vshekar committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    74081de View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Merge pull request NSLS-II#301 from NSLS-II/update-lsdc-prod-location 

    all production server and GUI instances will be run from lsdc_<tla>_prod
    @JunAishima
    JunAishima authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    e3b10b0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request NSLS-II#282 from JunAishima/service-user-2023-1 

    Service user 2023 1
    @JunAishima
    JunAishima authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    355b38b View commit details
    Browse the repository at this point in the history

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

    @JunAishima
    JunAishima committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    df311bf View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 2023-2-amxfmx

    @JunAishima
    JunAishima committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    0dcba83 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into one-branch-to-rule-them-all

    @JunAishima
    JunAishima authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7a963d6 View commit details
    Browse the repository at this point in the history

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

    One branch to rule them all
    @JunAishima
    JunAishima authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    4d069dd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into 2023-2-amxfmx

    @JunAishima
    JunAishima committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    a3698d0 View commit details
    Browse the repository at this point in the history

  8. Merge pull request NSLS-II#308 from JunAishima/2023-2-amxfmx 

    2023 2 amxfmx
    @JunAishima
    JunAishima authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    2823afc View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. remove homing pins after sample mount on FMX 

     * due to unreliable gpy homing
    @JunAishima
    JunAishima committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    b397f72 View commit details
    Browse the repository at this point in the history

  2. remove commented-out code for homing pins on FMX

    @JunAishima
    JunAishima committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    6a74183 View commit details
    Browse the repository at this point in the history

  3. move omega to 0 before SA->SE on FMX 

     * do this right before governor SA -> SE to prevent spurious
   changes to omega during windback to 0
    @JunAishima
    JunAishima committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    5f219dc View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

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

    @JunAishima
    JunAishima authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    9a54800 View commit details
    Browse the repository at this point in the history

  2. re-do commits removed after merging gui modularization

    @JunAishima
    JunAishima committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    e483951 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Removed hard coded return statements to properly return robot failures

    @vshekar
    vshekar committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    4bc82c0 View commit details
    Browse the repository at this point in the history

  2. Removed unecessary assignment

    @vshekar
    vshekar committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    64425a2 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Revert "comment out ISPyB calls to database" 

    This reverts commit 807573e.
    @JunAishima
    JunAishima committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    b89c788 View commit details
    Browse the repository at this point in the history

  2. Revert "fix for proposal name while ISPyB is down" 

    This reverts commit ce27170.
    @JunAishima
    JunAishima committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    3ee4228 View commit details
    Browse the repository at this point in the history

  3. use config from /etc/ispyb

    @JunAishima
    JunAishima committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    e736700 View commit details
    Browse the repository at this point in the history

  4. use mysql connector object from ISPyB connection

    @JunAishima
    JunAishima committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    f3653ae View commit details
    Browse the repository at this point in the history

  5. fix missing parenthesis

    @JunAishima
    JunAishima committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    f1fd622 View commit details
    Browse the repository at this point in the history

  6. Merge pull request NSLS-II#318 from vshekar/robot-fixes 

    Removed hard coded return statements to properly return robot failures
    @danielballan
    danielballan authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    df11338 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Merge pull request NSLS-II#319 from JunAishima/re-enable-ispyb 

    Re enable ispyb
    @JunAishima
    JunAishima authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    d173a6b View commit details
    Browse the repository at this point in the history

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

    @JunAishima
    JunAishima authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    b7bce67 View commit details
    Browse the repository at this point in the history

  3. Merge pull request NSLS-II#317 from JunAishima/remove-ispyblib-from-gui 

    re-do commits removed after merging gui modularization
    @JunAishima
    JunAishima authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    132306c View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Merge pull request NSLS-II#310 from JunAishima/small-fixes-2023-07-06 

    Small fixes 2023 07 06
    @JunAishima
    JunAishima authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    36ce2fa View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

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

    This reverts commit deec178.

 * un-doing my original plan to separate LSDC code into prod and dev
   locations. will keep running code from lsdc_<tla> for now
    @JunAishima
    JunAishima committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    19ddc5b View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge pull request NSLS-II#296 from vshekar/retry-mount-fix 

    Fixed wrong parameters passed to mount function when retrying after error
    @JunAishima
    JunAishima authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    2b429ce View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. initial release notes

    @JunAishima
    JunAishima committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    41d7517 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Merge pull request NSLS-II#322 from JunAishima/revert-running-lsdc-in… 

    …-lsdc-tla-prod

Revert running lsdc in lsdc tla prod
    @JunAishima
    JunAishima authored Aug 16, 2023
    Configuration menu
    Copy the full SHA
    d0bb07b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Removed replaceLine function 

    removed traceback
Fixed run_rd3d function call
    @vshekar
    vshekar committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    97eb6f0 View commit details
    Browse the repository at this point in the history

  2. Cleanup and formatting

    @vshekar
    vshekar committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    26d3de0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request NSLS-II#295 from vshekar/lifetime-fixes 

    Lifetime fixes
    @JunAishima
    JunAishima authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    43ac2f2 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Corrected docstring for fmx_flux_reference

    @vshekar
    vshekar committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    323d1c8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request NSLS-II#300 from vshekar/setE-cleanup 

    Added code to save FMX flux reference after setE
    @JunAishima
    JunAishima authored Sep 11, 2023
    Configuration menu
    Copy the full SHA
    4865dff View commit details
    Browse the repository at this point in the history

  3. further updates to release notes 

     * latest merges into master - setE, lifetime fixes
    @JunAishima
    JunAishima committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    ad16669 View commit details
    Browse the repository at this point in the history

  4. remove redundant line about FMX robot mount code changes

    @JunAishima
    JunAishima committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    8e43bcb View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Merge pull request NSLS-II#325 from NSLS-II/2023-2-amxfmx 

    2023 2 amxfmx
    @JunAishima
    JunAishima authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    8710eab View commit details
    Browse the repository at this point in the history

  2. Merge pull request NSLS-II#323 from JunAishima/release-notes-2023-3 

    initial release notes
    @JunAishima
    JunAishima authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    9291de4 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. fix ISPyB processing population error 

     * taking first 256 characters of processing commandline to
   prevent the error "Data too long for column 'p_commandLine'"
    @JunAishima
    JunAishima committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    44ad6a4 View commit details
    Browse the repository at this point in the history

  2. store last 255 characters of processing call 

     * better to lose the first part of the fastDP call than more
   significant information at the end of the call
    @JunAishima
    JunAishima committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    d550b92 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Refactored refresh dewartree view: 

    - Hide proposals that the user doesnt belong to
- Split long method into smaller methods
    @vshekar
    vshekar committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    5938511 View commit details
    Browse the repository at this point in the history

  2. Set datapath during request creation to come from blconfig

    @vshekar
    vshekar committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    a8fef96 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Minimum working example for showing puck info

    @vshekar
    vshekar committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    fd7310a View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. comment out ISPyB calls to database 

     * if not done, the server startup is extremely slow
 * can be undone when ISPyB returns
    @JunAishima
    JunAishima committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    e0d07dd View commit details
    Browse the repository at this point in the history

  2. fix for proposal name while ISPyB is down 

     * temporarily just use mx<proposal>-1 for all visits
 * disable newVisit()
 * do not call ispybLib
 * put into log and TODO messages that createVisit flag for setProposalID()
   and newVisit() won't work
    @JunAishima
    JunAishima committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    4516e17 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. restore setting visit name 

     * lost during cherry-picking
    @JunAishima
    JunAishima committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    7d1581a View commit details
    Browse the repository at this point in the history

  2. calcLifetimeCB is only calculated if fmx

    @vshekar
    vshekar committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    e58a4a3 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Merge pull request NSLS-II#327 from vshekar/datapath-fix 

    Sets datapath to any request to current visit directory
    @JunAishima
    JunAishima authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    b6dbc58 View commit details
    Browse the repository at this point in the history

  2. Merge pull request NSLS-II#331 from vshekar/2023-3-amxfmx 

    calcLifetimeCB is only calculated if fmx
    @JunAishima
    JunAishima authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    bac1b32 View commit details
    Browse the repository at this point in the history

  3. Merge pull request NSLS-II#330 from JunAishima/re-disable-ispyb-2023-3 

    Re disable ispyb 2023 3
    @JunAishima
    JunAishima authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    47c98ac View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 2023-3-amxfmx

    @JunAishima
    JunAishima committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    248c920 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Merge pull request NSLS-II#332 from JunAishima/2023-3-amxfmx 

    Trigger calcLifetimeCB only if on FMX
    @vshekar
    vshekar authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    239fc4c View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. hard code ISPyB DC ID for fastDP processing 

     * since ispybLib.insertResult() doesn't use this
   value, using 1 should be ok.
 * this needs to be reverted when ISPyB is re-enabled
    @JunAishima
    JunAishima committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    04cd2d8 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. use Pillow on server to resize crystal snapshot

    @JunAishima
    JunAishima committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    8c58596 View commit details
    Browse the repository at this point in the history

  2. Added env variable healthcheck

    @vshekar
    vshekar committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    e0f74ee View commit details
    Browse the repository at this point in the history

  3. Checks if user is proposal member or staff

    @vshekar
    vshekar committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    ed862b9 View commit details
    Browse the repository at this point in the history

  4. Attempting to add proposal number to puck label

    @vshekar
    vshekar committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    0c06632 View commit details
    Browse the repository at this point in the history

  5. Merge pull request NSLS-II#329 from vshekar/puck-visibility 

    Puck visibility
    @JunAishima
    JunAishima authored Oct 2, 2023
    Configuration menu
    Copy the full SHA
    7be5165 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Merge pull request NSLS-II#333 from JunAishima/2023-3-amxfmx 

    hard code ISPyB DC ID for fastDP processing
    @JunAishima
    JunAishima authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    151a71f View commit details
    Browse the repository at this point in the history

  2. fix logging message - show both ratio and filename

    @JunAishima
    JunAishima committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    3571780 View commit details
    Browse the repository at this point in the history

  3. fix missing import

    @JunAishima
    JunAishima committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    d482745 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Added single call to get all dewar data

    @vshekar
    vshekar committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    3d7c924 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. fix typo

    @JunAishima
    JunAishima committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    5a17f0c View commit details
    Browse the repository at this point in the history

  2. Merge pull request NSLS-II#326 from JunAishima/2023-3-amxfmx-ispyb-pr… 

    …ocessing

2023 3 amxfmx ispyb processing
    @JunAishima
    JunAishima authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    3f07c6c View commit details
    Browse the repository at this point in the history

  3. Merge pull request NSLS-II#335 from JunAishima/fix-ispyb-snapshot-resize 

    Fix ispyb snapshot resize
    @JunAishima
    JunAishima authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    4116872 View commit details
    Browse the repository at this point in the history

  4. Merge pull request NSLS-II#338 from vshekar/dewar-tree-faster-refresh 

    Added single call to get all dewar data and remove get() defaults
    @JunAishima
    JunAishima authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    a5bd381 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Fixed displaying puck name with proposal number

    @vshekar
    vshekar committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    5e23a43 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Added formatting to proposal id

    @vshekar
    vshekar committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    060b810 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge pull request NSLS-II#339 from vshekar/dewar-tree-puckname-fix 

    Fixed displaying puck name with proposal number
    @vshekar
    vshekar authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    f81b72d View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. merge conflicts

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    8f2a178 View commit details
    Browse the repository at this point in the history

  2. adding to dewar dialog

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    5b486be View commit details
    Browse the repository at this point in the history

  3. changin dewar dialog

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    ff17926 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. changing control_main

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    05b85be View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into new_md2

    @NYSBC-Rudra
    NYSBC-Rudra authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    c3a5c32 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from NYSBC-Rudra/new_md2 

    changing dewar dialog
    @NYSBC-Rudra
    NYSBC-Rudra authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    12fe082 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Fixing branch

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    20ee8c0 View commit details
    Browse the repository at this point in the history

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

    Fixing branch
    @NYSBC-Rudra
    NYSBC-Rudra authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    d10b8bf View commit details
    Browse the repository at this point in the history

  3. Adding resolution drop down to file menu 

    Final for now until testing
    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    1ec7ed5 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. adding gui folder to master

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    9233638 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. changing r value edits

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    498ee84 View commit details
    Browse the repository at this point in the history

  2. Replaced python calls with json

    @vshekar
    vshekar committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    5e7a846 View commit details
    Browse the repository at this point in the history

  3. Removed code formatting in daq_main_common

    @vshekar
    vshekar committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    a3bde35 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Using send_to_server to directly send messages

    @vshekar
    vshekar committed Nov 14, 2023
    1 Configuration menu
    Copy the full SHA
    d7b529b View commit details
    Browse the repository at this point in the history

  2. Removed missing import

    @vshekar
    vshekar committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    472310b View commit details
    Browse the repository at this point in the history

  3. Better exception handling

    @vshekar
    vshekar committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    79071fe View commit details
    Browse the repository at this point in the history

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

    …into jsonize-server-comm
    @vshekar
    vshekar committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    eda6414 View commit details
    Browse the repository at this point in the history

  5. making changes 

    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)
    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    6a35029 View commit details
    Browse the repository at this point in the history

  6. Removed unecessary generate_server_message

    @vshekar
    vshekar committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    7a4e958 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Fixed bug where setTrans was passing an extra arg

    @vshekar
    vshekar committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    21acc7f View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. updating error

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    93e8107 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from NYSBC-Rudra/resolutioncalc_dropdown 

    Resolutioncalc dropdown
    @NYSBC-Rudra
    NYSBC-Rudra authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    f6586e5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into larger_dewar

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    0bb315b View commit details
    Browse the repository at this point in the history

  4. adding devices

    @NYSBC-Rudra
    NYSBC-Rudra committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    3ad95f4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request NSLS-II#346 from vshekar/jsonize-server-comm 

    Replaced python calls with json
    @vshekar
    vshekar authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    6d644da View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. fixing dewar

    @NYSBC-Rudra
    NYSBC-Rudra committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    b61960d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'larger_dewar' of https://github.com/NYSBC-Rudra/lsdc in… 

    …to larger_dewar
    @NYSBC-Rudra
    NYSBC-Rudra committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    306c6fe View commit details
    Browse the repository at this point in the history

  3. in line with md2

    @NYSBC-Rudra
    NYSBC-Rudra committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    44c5bf2 View commit details
    Browse the repository at this point in the history