diff --git a/.gitattributes b/.gitattributes index d4dd52253b0f3bdc51f14a62059a882709786a45..cfb6a87b178007ceb11ffcb5c8c9cd2415ea8925 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2934,7 +2934,6 @@ LCU/checkhardware/check_hardware.py -text LCU/checkhardware/checkhardware_lib/__init__.py -text LCU/checkhardware/checkhardware_lib/data.py -text LCU/checkhardware/checkhardware_lib/db.py -text -LCU/checkhardware/checkhardware_lib/db_new.py -text LCU/checkhardware/checkhardware_lib/general.py -text LCU/checkhardware/checkhardware_lib/hardware_tests.py -text LCU/checkhardware/checkhardware_lib/hba.py -text @@ -2958,7 +2957,6 @@ LCU/checkhardware/checkhardware_lib/spectrum_checks/summator_noise.py -text LCU/checkhardware/checkhardware_lib/spectrum_checks/tools.py -text LCU/checkhardware/checkhardware_lib/spu.py -text LCU/checkhardware/checkhardware_lib/tbb.py -text -LCU/checkhardware/checkhardware_lib/test_db.py -text LCU/checkhardware/do_station_test.sh -text svneol=unset#application/x-shellscript LCU/checkhardware/rtsm.py -text LCU/checkhardware/show_bad_spectra.py -text @@ -4357,8 +4355,21 @@ MAC/Tools/NTP/timepps.h -text MAC/Tools/NTP/timer.c -text MAC/Tools/NTP/timer.c.patch -text MAC/Tools/NTP/timex.h -text +MAC/Tools/Power/ecSetObserving.py -text MAC/Tools/Power/ec_reset_trip.py -text MAC/Tools/Power/ec_set_observing.py -text +MAC/Tools/Power/isEcLib.py -text +MAC/Tools/Power/isReset48V.py -text +MAC/Tools/Power/isResetLCU.py -text +MAC/Tools/Power/isResetTrip.py -text +MAC/Tools/Power/isStatus.py -text +MAC/Tools/Power/isStatusData.py -text +MAC/Tools/Power/isTurnOff48V.py -text +MAC/Tools/Power/isTurnOffLCU.py -text +MAC/Tools/Power/isTurnOn48V.py -text +MAC/Tools/Power/nlEcLib.py -text +MAC/Tools/Power/nlStatus.py -text +MAC/Tools/Power/nlStatusData.py -text MAC/Tools/Power/reset_48v.py -text MAC/Tools/Power/reset_lcu.py -text MAC/Tools/Power/st_ec_lib.py -text diff --git a/LCU/checkhardware/checkhardware_lib/db_new.py b/LCU/checkhardware/checkhardware_lib/db_new.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/LCU/checkhardware/checkhardware_lib/reporting.py b/LCU/checkhardware/checkhardware_lib/reporting.py index 0d3b51b3f7559081c11edf04af40a077e11876c8..428fdb7d99cb5e0ff60bfc67c8d51b34149dbeb8 100644 --- a/LCU/checkhardware/checkhardware_lib/reporting.py +++ b/LCU/checkhardware/checkhardware_lib/reporting.py @@ -80,18 +80,18 @@ def spu_report(db, date, log): logger.debug("generate spu report") for spu in db.spu: spu.test() - if not spu.voltage_ok: - valstr = '' - if not spu.rcu_ok: - valstr += ",RCU-5.0V=%3.1f" % spu.rcu_5_0_volt - if not spu.lba_ok: - valstr += ",LBA-8.0V=%3.1f" % spu.lba_8_0_volt - if not spu.hba_ok: - valstr += ",HBA-48V=%3.1f" % spu.hba_48_volt - if not spu.spu_ok: - valstr += ",SPU-3.3V=%3.1f" % spu.spu_3_3_volt - if len(valstr): - log.add_line("%s,SPU,%03d,VOLTAGE%s" % (date, spu.nr, valstr)) + if not spu.voltage_ok: + valstr = '' + if not spu.rcu_ok: + valstr += ",RCU-5.0V=%3.1f" % spu.rcu_5_0_volt + if not spu.lba_ok: + valstr += ",LBA-8.0V=%3.1f" % spu.lba_8_0_volt + if not spu.hba_ok: + valstr += ",HBA-48V=%3.1f" % spu.hba_48_volt + if not spu.spu_ok: + valstr += ",SPU-3.3V=%3.1f" % spu.spu_3_3_volt + if len(valstr): + log.add_line("%s,SPU,%03d,VOLTAGE%s" % (date, spu.nr, valstr)) if not spu.temp_ok: log.add_line("%s,SPU,%03d,TEMPERATURE,PCB=%2.0f" % ( diff --git a/LCU/checkhardware/checkhardware_lib/test_db.py b/LCU/checkhardware/checkhardware_lib/test_db.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/MAC/Tools/Power/ecSetObserving.py b/MAC/Tools/Power/ecSetObserving.py new file mode 120000 index 0000000000000000000000000000000000000000..28676a0ccd6af777fd662dbdd418feb1dc8b5e8c --- /dev/null +++ b/MAC/Tools/Power/ecSetObserving.py @@ -0,0 +1 @@ +ec_set_observing.py \ No newline at end of file diff --git a/MAC/Tools/Power/isEcLib.py b/MAC/Tools/Power/isEcLib.py new file mode 120000 index 0000000000000000000000000000000000000000..1e65dd3e22300b482db5083928962a729e4612a3 --- /dev/null +++ b/MAC/Tools/Power/isEcLib.py @@ -0,0 +1 @@ +st_ec_lib.py \ No newline at end of file diff --git a/MAC/Tools/Power/isReset48V.py b/MAC/Tools/Power/isReset48V.py new file mode 120000 index 0000000000000000000000000000000000000000..6987f263f1747d45ea0bdb1f53a67137b387ca8b --- /dev/null +++ b/MAC/Tools/Power/isReset48V.py @@ -0,0 +1 @@ +reset_48v.py \ No newline at end of file diff --git a/MAC/Tools/Power/isResetLCU.py b/MAC/Tools/Power/isResetLCU.py new file mode 120000 index 0000000000000000000000000000000000000000..729a66dac82f14b04044482e4ad9d1d89635ab1f --- /dev/null +++ b/MAC/Tools/Power/isResetLCU.py @@ -0,0 +1 @@ +reset_lcu.py \ No newline at end of file diff --git a/MAC/Tools/Power/isResetTrip.py b/MAC/Tools/Power/isResetTrip.py new file mode 120000 index 0000000000000000000000000000000000000000..ca55cad4cda3abf7710b210917e1f405c5c021d8 --- /dev/null +++ b/MAC/Tools/Power/isResetTrip.py @@ -0,0 +1 @@ +ec_reset_trip.py \ No newline at end of file diff --git a/MAC/Tools/Power/isStatus.py b/MAC/Tools/Power/isStatus.py new file mode 120000 index 0000000000000000000000000000000000000000..65773e96ec556c207177646efcb09b94323e653b --- /dev/null +++ b/MAC/Tools/Power/isStatus.py @@ -0,0 +1 @@ +status.py \ No newline at end of file diff --git a/MAC/Tools/Power/isStatusData.py b/MAC/Tools/Power/isStatusData.py new file mode 120000 index 0000000000000000000000000000000000000000..95d9f7941c0944d9b137977489417542d680b0c5 --- /dev/null +++ b/MAC/Tools/Power/isStatusData.py @@ -0,0 +1 @@ +status_data.py \ No newline at end of file diff --git a/MAC/Tools/Power/isTurnOff48V.py b/MAC/Tools/Power/isTurnOff48V.py new file mode 120000 index 0000000000000000000000000000000000000000..26117b17a3f51cf8a76ec5a4a6dbd1f60bc1f292 --- /dev/null +++ b/MAC/Tools/Power/isTurnOff48V.py @@ -0,0 +1 @@ +turn_off_48v.py \ No newline at end of file diff --git a/MAC/Tools/Power/isTurnOffLCU.py b/MAC/Tools/Power/isTurnOffLCU.py new file mode 120000 index 0000000000000000000000000000000000000000..11caae5ac99ba6c41eaef4887ab42f64cdf4a2b2 --- /dev/null +++ b/MAC/Tools/Power/isTurnOffLCU.py @@ -0,0 +1 @@ +turn_off_lcu.py \ No newline at end of file diff --git a/MAC/Tools/Power/isTurnOn48V.py b/MAC/Tools/Power/isTurnOn48V.py new file mode 120000 index 0000000000000000000000000000000000000000..b8c3c7c03fd5521f8d0e8eea26836194c8d1eb69 --- /dev/null +++ b/MAC/Tools/Power/isTurnOn48V.py @@ -0,0 +1 @@ +turn_on_48v.py \ No newline at end of file diff --git a/MAC/Tools/Power/nlEcLib.py b/MAC/Tools/Power/nlEcLib.py new file mode 120000 index 0000000000000000000000000000000000000000..1e65dd3e22300b482db5083928962a729e4612a3 --- /dev/null +++ b/MAC/Tools/Power/nlEcLib.py @@ -0,0 +1 @@ +st_ec_lib.py \ No newline at end of file diff --git a/MAC/Tools/Power/nlStatus.py b/MAC/Tools/Power/nlStatus.py new file mode 120000 index 0000000000000000000000000000000000000000..65773e96ec556c207177646efcb09b94323e653b --- /dev/null +++ b/MAC/Tools/Power/nlStatus.py @@ -0,0 +1 @@ +status.py \ No newline at end of file diff --git a/MAC/Tools/Power/nlStatusData.py b/MAC/Tools/Power/nlStatusData.py new file mode 120000 index 0000000000000000000000000000000000000000..95d9f7941c0944d9b137977489417542d680b0c5 --- /dev/null +++ b/MAC/Tools/Power/nlStatusData.py @@ -0,0 +1 @@ +status_data.py \ No newline at end of file