Skip to content

Prep4.0.0 pre.1 #658

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

Merged
mlj5j merged 3 commits into from
Dec 2, 2025
Merged

Prep4.0.0 pre.1 #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83dab2b
preparing for v4.0.0-pre.1 release
ROMINGAIRHE Dec 2, 2025
9a7ec19
resetting defaults in siteConfig.py
ROMINGAIRHE Dec 2, 2025
393e011
switching the default json file
ROMINGAIRHE Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions Gui/siteConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
from MonitoringSettings import Monitor_SleepTime

CONFIG_VER = 7
CONFIG_VER = 8

# Customize the logging configuration
logging.basicConfig(
Expand Down Expand Up @@ -64,10 +64,13 @@

# Load instrument setup from json file
# If the json filename contains 'auto', channels will be automatically assigned as listed in Working Channels

json_setup = 'jsonFiles/instruments_osu_adcboardsldo.json'
with open(json_setup, 'r') as file:
icicle_instrument_setup = json.load(file)
try:
json_setup = 'jsonFiles/instruments_osu_adcboardsldo.json'
with open(json_setup, 'r') as file:
icicle_instrument_setup = json.load(file)
except FileNotFoundError:
print("Error: 'data.json' not found.")
exit()

#Set peak voltage for bias scan. Make sure this value is negative or it could damage the sensor.
IVcurve_range = {
Expand Down Expand Up @@ -122,14 +125,6 @@


## Update this dictionary for the IP addreses of your FC7 devices ##

try:
json_setup = 'jsonFiles/instruments_osu_adcboardsldo.json'
with open(json_setup, 'r') as file:
icicle_instrument_setup = json.load(file)
except FileNotFoundError:
print("Error: 'data.json' not found.")
exit()

FC7List = icicle_instrument_setup['fc7_address_dict']
icicle_instrument_setup.pop('fc7_address_dict')
Expand Down
2 changes: 1 addition & 1 deletion check_configuration_files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
REQUIRED_VERSION=7 # Will need to change this by hand
REQUIRED_VERSION=8 # Will need to change this by hand

# Loop over all files passed as arguments
for FILE in "$@"; do
Expand Down
4 changes: 2 additions & 2 deletions run_Docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash
# DO NOT EDIT THIS BY HAND!!!
CONFIG_VER=7
CONFIG_VER=8

bash check_configuration_files.sh run_Docker.sh Gui/siteConfig.py

SOCK=/tmp/.X11-unix; XAUTH=/tmp/.docker.xauth; xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -; chmod 777 $XAUTH;

######### Specify the docker image to use #################
IMAGE_NAME="osupixels/ph2_acf_gui_dev:v4.0.0-pre"
IMAGE_NAME="osupixels/ph2_acf_gui_dev:v4.0.0-pre.1"
#IMAGE_NAME="majoyce2/ph2_acf_gui_purdue:latest"
#IMAGE_NAME="majoyce2/ph2_acf_gui_user:latest"
#IMAGE_NAME="local/testimagemay29user"
Expand Down
Loading