Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
6bb776df
Commit
6bb776df
authored
Mar 05, 2020
by
ics
Browse files
Cfd2 update
parent
78bfc237
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/drivers/caen/caen_cfd2/CAENCfd2Driver.cpp
View file @
6bb776df
...
...
@@ -111,6 +111,14 @@ CAENCfd2Driver::CAENCfd2Driver(const std::string& name) {
adcTemperature
.
init
(
this
,
NOSAVE
,
"adc_temperature"
);
trapGate
.
init
(
this
,
SAVE
,
"trap_gate"
);
traceType
.
init
(
this
,
SAVE
,
"trace_type"
);
cfdThres
.
init
(
this
,
SAVE
,
"cfd_thres"
);
// Init the device command list
initCommand
(
driver
::
INIT_COMMAND
);
initCommand
(
driver
::
READ_INFOS_COMMAND
);
...
...
src/drivers/caen/caen_cfd2/CAENCfd2Driver.h
View file @
6bb776df
...
...
@@ -130,6 +130,11 @@ public:
// Channels adc temperature
DynamicProperty
<
int32
>
adcTemperature
;
// PVE add 24 01 2020
Property
<
int32
>
trapGate
;
Property
<
int32
>
traceType
;
Property
<
int32
>
cfdThres
;
// Commands
static
const
std
::
string
WRITE_PARAMETERS_COMMAND
;
static
const
std
::
string
SET_MODE_COMMAND
;
...
...
src/drivers/caen/caen_cfd2/RealCAENCfd2Driver.cpp
View file @
6bb776df
...
...
@@ -332,10 +332,13 @@ void RealCAENCfd2Driver::writeParam() {
registerSetBits(0x1080 + (i<<8), 26, 26, 1); // enable rollover tracing // enable rollover tracing
*/
ret
|=
CAEN_DGTZ_WriteRegister
(
m_boardHandle
,
0x1058
+
(
i
<<
8
),
0x138
);
ret
|=
CAEN_DGTZ_WriteRegister
(
m_boardHandle
,
0x1058
+
(
i
<<
8
),
owner
()
->
trapGate
.
get
());
// ret |= CAEN_DGTZ_WriteRegister(m_boardHandle, 0x1058 + (i<<8), 0x138);
ret
|=
CAEN_DGTZ_WriteRegister
(
m_boardHandle
,
0x106C
+
(
i
<<
8
),
thr
);
// thr
ret
|=
CAEN_DGTZ_WriteRegister
(
m_boardHandle
,
0x1038
+
(
i
<<
8
),
owner
()
->
preTrigger
.
get
(
i
)
/
4
);
// pretrg
ret
|=
CAEN_DGTZ_WriteRegister
(
m_boardHandle
,
0x10D0
+
(
i
<<
8
),
0x60A6
);
ret
|=
CAEN_DGTZ_WriteRegister
(
m_boardHandle
,
0x10D0
+
(
i
<<
8
),
((
owner
()
->
cfdThres
.
get
()
&
0xF
)
<<
12
)
+
((
owner
()
->
triggerSmoothing
.
get
(
i
)
&
0xF
)
<<
4
)
+
(
owner
()
->
traceType
.
get
()
&
0xF
));
// ret |= CAEN_DGTZ_WriteRegister(m_boardHandle, 0x10D0 + (i<<8), 0x60A6);
// ret |= CAEN_DGTZ_WriteRegister(m_boardHandle, 0x10D0 + (i<<8), 0x6006);
registerSetBits
(
0x1080
+
(
i
<<
8
),
16
,
16
,
int32
(
owner
()
->
pulsePolarity
.
get
(
i
)));
// Write CFD parameters
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment