fixed corruption

This commit is contained in:
Martino Ferrari
2026-02-06 15:43:59 +01:00
parent aed46398a3
commit 3a0933a2c4

View File

@@ -15,54 +15,81 @@
Signals = {
Status = {
Type = uint32
NumberOfElements = @slow_clock
}
GY_APS_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 0
}
GY_APS_I_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 1
}
GY_BPS_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 2
}
GY_BPS_I_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 3
}
GY_MHV_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 4
}
GY_MHV_I_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 5
}
GY_ARC1_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 6
}
GY_ARC2_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 7
}
GY_ARC3_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 8
}
GY_RF_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
ChannelId = 9
}
}
}
+TimingBoard = {
Class = NI6683H
BoardId = 0
Signals = {
Status = {
Type = uint8
}
PtpdStatus = {
Type = uint8
}
Time = {
Type = uint64
}
}
}
+DDB4 = {
Class = GAMDataSource
Signals = {
PXI6368_Status = {
Type = uint32
NumberOfElements = @slow_clock
}
GY_APS_V_MEAS = {
Type = float32
@@ -109,7 +136,7 @@
+FastAnalogDAN = {
Class = DANSource
NumberOfBuffers = 10
CPUMask = 15
CPUMask = @cpus_adc
StackSize = 10000000
DanBufferMultiplier = 4
StoreOnTrigger = 1
@@ -117,54 +144,70 @@
NumberOfPreTriggers = 0
NumberOfPostTriggers = 0
Signals = {
Trigger_DAN = {
Trigger = {
Type = uint8
}
AI_Time = {
Type = uint64
TimeSignal = 1
AbsoluteTime = 1
TimeSignalMultiplier = 1e-9
}
GY_APS_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_APS_V_MEAS")
}
GY_APS_I_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_APS_I_MEAS")
}
GY_BPS_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_BPS_V_MEAS")
}
GY_BPS_I_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_BPS_I_MEAS")
}
GY_MHV_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_MHV_V_MEAS")
}
GY_MHV_I_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_MHV_I_MEAS")
}
GY_ARC1_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_ARC1_V_MEAS")
}
GY_ARC2_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_ARC2_V_MEAS")
}
GY_ARC3_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_ARC3_V_MEAS")
}
GY_RF_V_MEAS = {
Type = float32
NumberOfElements = @slow_clock
NodeName = (@rfid .. ":GY_RF_V_MEAS")
}
}
}
+AnalogEpicsOutput = {
Class = EPICSCAOutput
CPUMask = @cpus_adccs// change from 0x200
CPUMask = @cpus_adc // change from 0x200
StackSize = 10000000
NumberOfBuffers = 2
Signals = {
@@ -221,6 +264,7 @@
PXI6368_Status = {
Type = uint32
}
GY_APS_V_MEAS = {
Type = float32
}
@@ -265,43 +309,33 @@
}
GY_APS_V_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_APS_I_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_BPS_V_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_BPS_I_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_MHV_V_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_MHV_I_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_ARC1_V_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_ARC2_V_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_ARC3_V_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
GY_RF_V_MEAS = {
DataSource = FastADC
Samples = @slow_clock
}
}
OutputSignals = {
@@ -346,6 +380,9 @@
TRIGGER_DAN = {
DataSource = EPICSCAInput
}
Time = {
DataSource = TimingBoard
}
GY_APS_V_MEAS = {
DataSource = DDB4
}
@@ -378,10 +415,13 @@
}
}
OutputSignals = {
Trigger_DAN = {
Trigger = {
DataSource = FastAnalogDAN
}
GY_APS_V_MEAS = {
AI_Time = {
DataSource = FastAnalogDAN
}
GY_APS_V_MEAS = {
DataSource = FastAnalogDAN
}
GY_APS_I_MEAS = {
@@ -419,9 +459,11 @@
PXI6368_Status_Async = {
Alias = PXI6368_Status
DataSource = DDB4
Range = { { 0, 0 } }
}
PXI6368_Status = {
DataSource = DDB4
Range = { { 0, 0 } }
}
GY_APS_V_MEAS_Async = {
Alias = GY_APS_V_MEAS