diff --git a/.gitignore b/.gitignore index edf5d39..775e3a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +reset_lis +reset_lis~ hush_devl.sh *.*~ *.*-* diff --git a/hush.sh b/hush.sh index f60870c..164b0e4 100755 --- a/hush.sh +++ b/hush.sh @@ -35,15 +35,15 @@ fi echo "PYTHON_VERSION $PYTHON_VERSION" - -_EPICS_HOST_ARCH=${EPICS_HOST_ARCH} +_EPICS_HOST_ARCH=${RHREL}-x86_64 +#_EPICS_HOST_ARCH=${EPICS_HOST_ARCH} . /opt/gfa/python $PYTHON_VERSION #/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current #/sf/bd/applications/OnlineModel/default/scripts/VA: #C_EXT version for Py 3.7: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.18.0/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.6.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.6.0 #:/afs/psi.ch/intranet/SLS/Controls/BD/pyqtacc/v1.5.2 diff --git a/summary2004.txt b/summary2004.txt new file mode 100644 index 0000000..8adb910 --- /dev/null +++ b/summary2004.txt @@ -0,0 +1,11 @@ +Summary for 2024 + +Power saved for the current year stands at 1516.412 MWh: +IP2: 314.258 MWh +IW2: 91.529 MWh +PK1: 86.399 MWh +PK2: 393.997 MWh +SNQ: 178.202 MWh +UCN: 452.027 MWh +------------------ +Tot: 1516.412 MWh diff --git a/zero_totsave b/zero_totsave new file mode 100644 index 0000000..68bac19 --- /dev/null +++ b/zero_totsave @@ -0,0 +1,9 @@ +caput ZIP2-HUSH:TOTSAVE 0 +caput ZIW2-HUSH:TOTSAVE 0 +caput ZPK1-HUSH:TOTSAVE 0 +caput ZPK2-HUSH:TOTSAVE 0 +caput ZSINQ-HUSH:TOTSAVE 0 +caput ZUCN-HUSH:TOTSAVE 0 +caput ZHIPA-HUSH:TOTSAVE 0 + + diff --git a/zero_totsave~ b/zero_totsave~ new file mode 100644 index 0000000..ad78aaf --- /dev/null +++ b/zero_totsave~ @@ -0,0 +1,14 @@ +caput ZIP2-HUSH:TOTSAVE 197.85 +caput ZIW2-HUSH:TOTSAVE 73.92 +caput ZPK1-HUSH:TOTSAVE 69.49 +caput ZPK2-HUSH:TOTSAVE 374.06 +caput ZSINQ-HUSH:TOTSAVE 131.20 +caput ZUCN-HUSH:TOTSAVE 283.40 +caput ZHIPA-HUSH:TOTSAVE 1129.92 + +caput ZIP2-HUSH:LASTPWR 67.503 +caput ZIW2-HUSH:LASTPWR 353.041 +caput ZPK1-HUSH:LASTPWR 337.081 +caput ZPK2-HUSH:LASTPWR 400.857 +caput ZSINQ-HUSH:LASTPWR 570.319 +caput ZUCN-HUSH:LASTPWR 124.609