From 7a1a8da39c068521e9bd98af03a6fdcbf22db6a2 Mon Sep 17 00:00:00 2001
From: ferrog <giuseppe.ferro@iter.org>
Date: Mon, 9 Feb 2026 18:58:15 +0000
Subject: [PATCH] Set Analog DAN on different CPU that ADC

---
 .../Configurations/src/data/epics.marte                     | 2 +-
 .../Configurations/src/thread3/pxi_io_gams.marte            | 2 +-
 .../Configurations/src/thread4/adc_2_dan.marte              | 6 +++---
 .../Configurations/src/timers.marte                         | 3 ---
 .../Configurations/src/variables.marte                      | 1 +
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
index 2ef21bf..27ccacc 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
@@ -209,7 +209,7 @@
   Class = EPICSCAOutput
   CPUMask = @cpus_epics// change from 0x200
   StackSize = 10000000
-  NumberOfBuffers = 2
+  NumberOfBuffers = 50
   Signals = {
     PCF_STATE = {
       PVName = (@rfid .. "-GAF:STAT-SM")
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/pxi_io_gams.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/pxi_io_gams.marte
index bcf36f2..e8d94d5 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/pxi_io_gams.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/pxi_io_gams.marte
@@ -94,7 +94,7 @@
 // Digital Output port access.
 // EPICS PV to one uint8 variable
 +NI6528_0_WriterGAM = {
-  Class = IOExt::CompactBitGAM
+  Class = "IOExt::CompactBitGAM"
   InputSignals = {
     APS_HVON = {
       DataSource = DDB3
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
index 3b1776d..6956be4 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
@@ -131,7 +131,7 @@
   +FastAnalogDAN = {
     Class = "DAN::DANSource"
     NumberOfBuffers = 10000
-    CPUMask = @cpus_adc
+    CPUMask = @cpus_fdan
     StackSize = 10000000
     DanBufferMultiplier = 10000 //10s at 1kHz loop (1M with 1k samples)
     StoreOnTrigger = 1
@@ -212,9 +212,9 @@
   }
   +AnalogEpicsOutput = {
     Class = "EPICSCA::EPICSCAOutput"
-    CPUMask = @cpus_adc // change from 0x200
+    CPUMask = @cpus_epics // change from 0x200
     StackSize = 10000000
-    NumberOfBuffers = 2
+    NumberOfBuffers = 50
     Signals = {
       PXI6368_Status = {
         Type = uint32
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte
index ce7b754..940a43c 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte
@@ -7,7 +7,6 @@
     SleepNature = "Busy"
     SleepPercentage = 40
     ExecutionMode = "RealTimeThread"
-    CPUMask = 0x200
     Signals = {
       Counter = {
         Type = uint32
@@ -23,7 +22,6 @@
     SleepNature = "Busy"
     SleepPercentage = 40
     ExecutionMode = "RealTimeThread"
-    CPUMask = 0x400
     Signals = {
       Counter = {
         Type = uint32
@@ -42,7 +40,6 @@
     SleepNature = "Busy"
     SleepPercentage = 40
     ExecutionMode = "RealTimeThread"
-    CPUMask = 0x700
     Signals = {
       Counter = {
         Type = uint32
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/variables.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/variables.marte
index c5c1365..f8a67bb 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/variables.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/variables.marte
@@ -42,3 +42,4 @@
 #var cpus_dio: uint = 0x80
 #var cpus_dan: uint = 0x100
 #var cpus_wg: uint = 0x200
+#var cpus_fdan: uint = 0x400