From 6a0ecf057348d2967e7d2863da0da4d6166075d8 Mon Sep 17 00:00:00 2001 From: "Ryan@WorkStation" Date: Thu, 26 Jan 2023 17:05:13 -0500 Subject: [PATCH] test coincident --- ClassDigitizer2Gen.cpp | 23 ++++++++++++++++++++--- SOLARISDAQ.cpp | 4 ++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ClassDigitizer2Gen.cpp b/ClassDigitizer2Gen.cpp index bf0d0f7..743c814 100644 --- a/ClassDigitizer2Gen.cpp +++ b/ClassDigitizer2Gen.cpp @@ -571,13 +571,30 @@ void Digitizer2Gen::ProgramPHA(bool testPulse){ WriteValue("/ch/0..63/par/EventTriggerSource", "Ch64Trigger"); WriteValue("/ch/0..63/par/WaveTriggerSource" , "Ch64Trigger"); - WriteValue("/ch/0..63/par/ChannelsTriggerMask", "0x0000FFFF000F000F"); + //WriteValue("/ch/0..63/par/ChannelsTriggerMask", "0x0000FFFF000F000F"); + + //WriteValue("/ch/0..3/par/ChannelsTriggerMask", "0x1"); + //WriteValue("/ch/4..7/par/ChannelsTriggerMask", "0x10"); + //WriteValue("/ch/0/par/ChannelsTriggerMask", "0x000F"); //WriteValue("/ch/12/par/ChannelsTriggerMask", "0x000F"); //WriteValue("/ch/38/par/ChannelsTriggerMask", "0x000F"); // when channel has no input, it still record. - //WriteValue("/ch/0..63/par/CoincidenceMask", "Ch64Trigger"); - //WriteValue("/ch/0..63/par/CoincidenceLength", "100"); //ns + //----------- coincident trigger to ch-0 + WriteValue("/ch/0/par/ChannelsTriggerMask", "0x1"); + + WriteValue("/ch/0..3/par/EventTriggerSource", "ChSelfTrigger"); + WriteValue("/ch/1..3/par/CoincidenceMask", "Ch64Trigger"); + WriteValue("/ch/1..3/par/CoincidenceLengthT", "10"); // ns + + + //WriteValue("/ch/8..11/par/ChannelsTriggerMask", "0x100"); + + //WriteValue("/ch/9..11/par/EventTriggerSource", "ChSelfTrigger"); + //WriteValue("/ch/9..11/par/CoincidenceMask", "Ch64Trigger"); + //WriteValue("/ch/9..11/par/CoincidenceLengthT", "10"); // ns + + //======== ACQ trigger? //WriteValue("/ch/0..63/par/EventTriggerSource", "GlobalTriggerSource"); diff --git a/SOLARISDAQ.cpp b/SOLARISDAQ.cpp index 6f9dcdd..e71dd68 100644 --- a/SOLARISDAQ.cpp +++ b/SOLARISDAQ.cpp @@ -124,8 +124,8 @@ static void MainWindow (GtkApplication *app){ //g_signal_connect( bnEnd, "clicked", G_CALLBACK(OpenDigitizers), NULL); gtk_box_append( GTK_BOX(box3), bnEnd); - GtkWidget * cbRunNum = gtk_combo_box_new(); - gtk_box_append( GTK_BOX(box3), cbRunNum); + GtkWidget * spinRunNum = gtk_spin_button_new(gtk_adjustment_new(0, 0, 1000, 1, 10, 0), 1, 0); + gtk_box_append( GTK_BOX(box3), spinRunNum); }