From 2f4868c7c77d295495c0c5bb54a8eae8f29505e2 Mon Sep 17 00:00:00 2001
From: l_samenv <l_samenv@samenv.psi.ch>
Date: Mon, 28 Oct 2024 14:13:39 +0100
Subject: [PATCH] CCR2,CCR2HT: exchange loops

this is needed to achieve 650 K on the hot stage
---
 tcl/ccr2.config   | 22 +++++++++++++---------
 tcl/ccr2ht.config |  4 ++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tcl/ccr2.config b/tcl/ccr2.config
index 403288f..9775a86 100644
--- a/tcl/ccr2.config
+++ b/tcl/ccr2.config
@@ -5,13 +5,17 @@ defineTemperature tt
 makenv tt -driver [lsdriver] {
   lsc_sensor tm B -sensor x31319 -sensorname main
   lsc_sensor te A -sensor x31318 -sensorname screen
-  lsc_loop set -loop 2 -channel C -maxheater 100W -resist 25Ohm
+  if {[lsdriver] eq "336_lsc"} {
+    lsc_loop set -loop 2 -channel A -maxheater 100W -resist 25Ohm
+  }
+}
+if {[catch {
+  tt set/limit 310
+  tt set/prop 10
+  tt set/integ 2
+}]} {
+  error "CCR2 does not work with a LakeShore 340"
+} else {
+  appendVars tt.te/K/Screen_T/7 tt.p/W/Power/1
+  makeCCU4 ccr2ht
 }
-tt set/limit 310
-tt set/prop 10
-tt set/integ 2
-appendVars tt.te/K/Screen_T/7 tt.p/W/Power/1
-
-makeCCU4 ccr2ht
-
-
diff --git a/tcl/ccr2ht.config b/tcl/ccr2ht.config
index aff3b41..1d2f62e 100644
--- a/tcl/ccr2ht.config
+++ b/tcl/ccr2ht.config
@@ -6,10 +6,10 @@ makenv tt -driver [lsdriver] {
   lsc_sensor tm C -sensor pt1000e -sensorname main -alarm 650
   lsc_sensor te B -sensor x31318 -sensorname screen
   lsc_sensor tk A -sensor x31319 -sensorname coldfinger -alarm 310
+  lsc_loop set -loop 1 -channel C -maxheater 100W -resist 25Ohm
   if {[lsdriver] eq "336_lsc"} {
-    lsc_loop set -loop 2 -channel C -maxheater 100W -resist 25Ohm
+    lsc_loop setcf -loop 2 -channel A -maxheater 50W -resist 25Ohm -loopname cf
   }
-  lsc_loop setcf -loop 1 -channel B -maxheater 100W -resist 25Ohm -loopname cf
 }
 
 tt set/limit 650