From bbbcf33dd418ad4f50ebef4d9a10dc6253a46910 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Thu, 2 Dec 2021 14:01:09 +0100
Subject: [PATCH] cleaned up channels a bit

---
 channels.py | 60 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/channels.py b/channels.py
index 8c2c87f..2a4835b 100644
--- a/channels.py
+++ b/channels.py
@@ -1,6 +1,16 @@
 
+detectors = [
+#    "JF15T08V01"
+]
+
+
+
+
+
 #    "SLAAR11-LTIM01-EVR0:DUMMY_PV5_NBS",
-channels_nbs = [f"SATES20-CVME-EVR0:DUMMY_PV{i+1}_NBS" for i in range(10)]
+channels_nbs = [
+    f"SATES20-CVME-EVR0:DUMMY_PV{i+1}_NBS" for i in range(10)
+]
 
 
 channels_inten = [
@@ -15,7 +25,9 @@ channels_inten = [
 ]
 
 # CH 0-3 farday cup / 4&5 multipliers
-channels_inten += [f"SATFE10-LSCP1:CH{n}:1" for n in range(6)]
+channels_inten += [
+    f"SATFE10-LSCP1:CH{n}:1" for n in range(6)
+]
 
 
 channels_ks = [
@@ -25,21 +37,17 @@ channels_ks = [
 #    "SATES21-GES1:A4_VALUES",
 ]
 
-channels_cam_pco = [
-    "SATES21-CAMS154-M1:FPICTURE",
-    "SATES24-CAMS161-M1:FPICTURE",
-    "SATES21-CAMS-PATT1:FPICTURE",
-]
 
 channels_cam_gige = [
     f"SATES21-CAMS154-GIGE{i+1}:FPICTURE" for i in range(8)
 ]
 
 
-#channels = channels_nbs + channels_inten + channels_ks
-#channels = channels_nbs + channels_inten + channels_ks + channels_cam_pco
-channels = channels_nbs + channels_inten + channels_ks + channels_cam_pco + channels_cam_gige
-
+channels_cam_pco = [
+    "SATES21-CAMS154-M1:FPICTURE",
+    "SATES24-CAMS161-M1:FPICTURE",
+    "SATES21-CAMS-PATT1:FPICTURE",
+]
 
 names_cam_pco = [
     "SATES21-CAMS154-M1",
@@ -54,7 +62,14 @@ suffices_proc = [
 for n in names_cam_pco:
     for s in suffices_proc:
         c = f"{n}.{s}"
-        channels.append(c)
+        channels_cam_pco.append(c)
+
+
+
+channels = channels_nbs + channels_inten + channels_ks + channels_cam_pco + channels_cam_gige
+
+
+
 
 
 pvs = [
@@ -90,9 +105,18 @@ pvs = [
     "SWISSFEL-STATUS:Bunch-2-Appl-Freq-RB", 
 ]
 
-pvs += [f"SATES20-CVME-EVR0:DUMMY_PV{i+1}_NBS.INP" for i in range(10)]
-pvs += [f"SATUN{i:02}-UIND030:FELPHOTENE" for i in range(6, 22+1) if i != 14]
-pvs += [f"SATUN{i:02}-UIND030:POL-SET" for i in range(6, 22+1) if i != 14]
+
+pvs += [
+    f"SATES20-CVME-EVR0:DUMMY_PV{i+1}_NBS.INP" for i in range(10)
+]
+
+pvs += [
+    f"SATUN{i:02}-UIND030:FELPHOTENE" for i in range(6, 22+1) if i != 14
+]
+
+pvs += [
+    f"SATUN{i:02}-UIND030:POL-SET" for i in range(6, 22+1) if i != 14
+]
 
 
 for n in ("TEMP", "HUMIREL", "PRES"):
@@ -105,9 +129,3 @@ for n in ("TEMP", "HUMIREL", "PRES"):
 
 
 
-detectors = [
-#    "JF15T08V01"
-]
-
-
-