From b4196d02ef33a9869eda8770f492015ad3aa4c2e Mon Sep 17 00:00:00 2001
From: Adrien Laviron <adrien.laviron@csnsm.in2p3.fr>
Date: Fri, 5 Mar 2021 15:12:12 +0100
Subject: [PATCH] Changed hard-coded file paths
---
.../ComptonTelescope/online/calibrations.txt | 2 +-
.../online/configs/ConfigComptonTelescope.dat | 4 +++-
.../online/src/online_coinc.cpp | 18 ++++++++++--------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Projects/ComptonTelescope/online/calibrations.txt b/Projects/ComptonTelescope/online/calibrations.txt
index 1fcb843fc..71fec4f00 100644
--- a/Projects/ComptonTelescope/online/calibrations.txt
+++ b/Projects/ComptonTelescope/online/calibrations.txt
@@ -1,5 +1,5 @@
CalibrationFilePath
- ./calibrations/DSSSD_calibration_withPed_pol3_ok.txt
+ ./calibrations/DSSSD_D1_Calibration_run10_newCal.txt
./calibrations/CeBr3_PED.txt
./calibrations/CeBr3_PED3.txt
./calibrations/CeBr3_PED4.txt
diff --git a/Projects/ComptonTelescope/online/configs/ConfigComptonTelescope.dat b/Projects/ComptonTelescope/online/configs/ConfigComptonTelescope.dat
index 380f07918..f70468ddd 100644
--- a/Projects/ComptonTelescope/online/configs/ConfigComptonTelescope.dat
+++ b/Projects/ComptonTelescope/online/configs/ConfigComptonTelescope.dat
@@ -3,7 +3,9 @@ ConfigComptonTelescope
ONLY_GOOD_COUPLE_WITH_MULTIPLICITY_ONE ON
FRONT_BACK_ENERGY_MATCHING_SIGMA 0.006
FRONT_BACK_ENERGY_MATCHING_NUMBER_OF_SIGMA 2
- DISABLE_CHANNEL COMPTONTELESCOPE_D1_STRIP_FRONT1_E
+ DISABLE_CHANNEL COMPTONTELESCOPE_D1_STRIP_FRONT21_E
+ DISABLE_CHANNEL COMPTONTELESCOPE_D1_STRIP_BACK18_E
+ DISABLE_CHANNEL COMPTONTELESCOPE_D1_STRIP_BACK22_E
STRIP_FRONT_E_RAW_THRESHOLD 0
STRIP_BACK_E_RAW_THRESHOLD 0
STRIP_FRONT_E_THRESHOLD 0.012
diff --git a/Projects/ComptonTelescope/online/src/online_coinc.cpp b/Projects/ComptonTelescope/online/src/online_coinc.cpp
index 975f91393..7845d574b 100644
--- a/Projects/ComptonTelescope/online/src/online_coinc.cpp
+++ b/Projects/ComptonTelescope/online/src/online_coinc.cpp
@@ -26,7 +26,7 @@
#undef __USE_CUTG__
#define __RESET_SEARCH__
-//#undef __RESET_SEARCH__
+#undef __RESET_SEARCH__
// C++ headers
#include <iostream>
@@ -110,7 +110,7 @@ int main()
DecodeT* DT = new DecodeT(false); // Instantiates DecodeT object reading trigger data flux
DecodeD* DD = new DecodeD(false); // Instantiates DecodeD object reading DSSSD(s) data flux
newframe_t* event;
- DD -> setTree("/disk/proto-data/data/20210210_run1/bb7_3309-7_cs137-20210210_11h05_coinc_run1_conv.root");
+ DD -> setTree("/disk/proto-data/data/20210304_run2/bb7_3309-7_cs137_20210304_14h35_conv.root");
int dlen = DD -> getLength();
int i = 0;// ROSMAP files loop counter
@@ -148,7 +148,7 @@ int main()
ifstream iros, itrig;
cout << "Loading data files ";
- itrig.open("/disk/proto-data/data/20210210_run1/mfm_trigger_202102101104.raw", ios::binary);
+ itrig.open("/disk/proto-data/data/20210304_run2/mfm_trigger_20210304_run2.raw", ios::binary);
itrig.seekg(0, ios::end);
int tlen = itrig.tellg();
itrig.seekg(0, ios::beg);
@@ -157,7 +157,7 @@ int main()
itrig.close();
cout << "... ";
- iros.open("/disk/proto-data/data/20210210_run1/mfm_rdd_rosmap_04_mfm_rosmap_04_2021-02-10_10_04_59.raw.0001", ios::binary);
+ iros.open("/disk/proto-data/data/20210304_run2/mfm_rdd_rosmap_04_mfm_rosmap_04_2021-03-04_13_34_30.raw.0001", ios::binary);
iros.seekg(0, ios::end);
int rlen = iros.tellg();
iros.seekg(0, ios::beg);
@@ -170,10 +170,12 @@ int main()
DT -> setRaw(tbuff);
DT -> decodeBlobMFM();
int resetCount = DT -> getResetCount();
- while (not(DT->hasTrigged(2))) {
+ //while (not(DT->hasTrigged(2))) {
+ while (not(DT->hasTrigged(0))) {
DT -> decodeBlobMFM();
}
resetCount = DT->getResetCount() - resetCount;
+ resetCount = -resetCount; // T B C !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
cout << "Found reset count: " << resetCount << endl;
#if defined __RESET_SEARCH__ && !defined __TEST_ZONE__
@@ -198,8 +200,8 @@ int main()
int td = DD -> getTime();
// int dt = 100;
#if defined __RESET_SEARCH__
-// while(DR -> getCursor() < rlen and DD -> getCursor() < dlen)
- while(c < 1000)
+ while(DR -> getCursor() < rlen and DD -> getCursor() < dlen)
+// while(c < 1000)
{
// cout << DR -> getTime() << " " << DD -> getTime() << endl;
if (cr == cd) {
@@ -216,7 +218,7 @@ int main()
{
if (cr == cd) {
#ifndef __TEST_ZONE__
- if (td-tr > 0 and td-tr < 110) { // That one is the real one
+ if (td-tr > 20 and td-tr < 120) { // That one is the real one
#else
if (td-tr > -1000 and td-tr < 1000) {
#endif
--
GitLab