Merge lp:~vpec/maus/tof_calib_read into lp:maus/merge

[Viktor Pec]

Modifications to TOF reconstruction related code.

Some changes to TOF reconstruciton code - improved reading of calibration constants from files: smarter look up of the files specified in the job configuration and the loading now does not fail when there is a new line at the end of the input file. If relative path of the calibration files are given starting with '.', these paths are assumed relative to the current directory, relative path not starting with '.' will be assumed relative to MAUS_ROOT_DIR. Absolut path can be supplied too.

=== modified file 'src/common_cpp/Utils/TOFCalibrationMap.cc'
--- src/common_cpp/Utils/TOFCalibrationMap.cc	2017-05-01 14:37:25 +0000
+++ src/common_cpp/Utils/TOFCalibrationMap.cc	2018-07-26 10:02:12 +0000
@@ -134,15 +134,29 @@
   bool loaded;
   if (!fromDB) {
 //       std::cout << "#### initializing from FILE ####" << std::endl;
-      std::string xMapT0File = std::string(pMAUS_ROOT_DIR) + t0_file.asString();
-      std::string xMapTWFile = std::string(pMAUS_ROOT_DIR) + tw_file.asString();
-      std::string xMapTriggerFile = std::string(pMAUS_ROOT_DIR) + trigger_file.asString();
-      // Load the calibration constants.
-      loaded = this->Initialize(xMapT0File, xMapTWFile, xMapTriggerFile);
+    std::string xMapT0File = t0_file.asString();
+    std::string xMapTWFile = tw_file.asString();
+    std::string xMapTriggerFile = trigger_file.asString();
+    // Load the calibration constants.
+    // VP: make the file look up a bit smarter. Don't look into
+    // MAUS_ROOT_DIR is relative or absolute path is given
+    if (t0_file.asString().at(0) != '.' && t0_file.asString().at(0) != '/') {
+      xMapT0File = (std::string(pMAUS_ROOT_DIR) + "/") + xMapT0File;
+      xMapTWFile = (std::string(pMAUS_ROOT_DIR) + "/") + xMapTWFile;
+      xMapTriggerFile = (std::string(pMAUS_ROOT_DIR) + "/") + xMapTriggerFile;
+    }
+
+    Squeak::mout(Squeak::info) << "Will load TOF calibration constants from files:" << endl
+			       << xMapT0File << endl
+			       << xMapTWFile << endl
+			       << xMapTriggerFile << endl;
+
+    loaded = this->Initialize(xMapT0File, xMapTWFile, xMapTriggerFile);
+
   } else {
 //       std::cout << "#### initializing from CDB ####" << std::endl;
-      // get calib from DB instead of file, the above line is replaced by the one below
-      loaded = this->InitializeFromCDB();
+    // get calib from DB instead of file, the above line is replaced by the one below
+    loaded = this->InitializeFromCDB();
   }
   if (!loaded)
     return false;
@@ -157,6 +171,8 @@
                 LoadTWFile(twFile) &&
                 LoadTriggerFile(triggerFile);
 
+  // this->Print();
+
   return status;
 }
 
@@ -210,14 +226,23 @@
   int reff;
   double p0;
   TOFChannelKey key;
+  int nkeys = 0;
   try {
-    while (!stream.eof()) {
-      stream >> key >> p0 >> reff;
+    char temp[255];
+    while (stream.getline(temp, 255)) {
+      stringstream ss(temp);
+
+      ss >> key >> p0 >> reff;
+      // Squeak::mout(Squeak::info)<<key<<endl;
 
       int n = FindTOFChannelKey(key);
+      if (n == NOCALIB) // unknown channel in the calibration file, gracefully ignore
+	continue;
       _t0[n] = p0;
       _reff[n] = reff;
-      // std::cout << key << " pos:" << n << "  t0:" << p0 << "  reff:" << reff << std::endl;
+      nkeys++;
+      // Squeak::mout(Squeak::info) << key << " pos:" << n
+      // << "  t0:" << p0 << "  reff:" << reff << std::endl;
     }
   } catch (MAUS::Exceptions::Exception e) {
     Squeak::mout(Squeak::error)
@@ -226,6 +251,8 @@
     return false;
   }
 
+  Squeak::mout(Squeak::info) << "Loaded TOF T0 constants for " << nkeys << " channels." << endl;
+
   return true;
 }
 
@@ -240,17 +267,24 @@
 
   double p0, p1, p2, p3;
   TOFChannelKey key;
+  int nkeys = 0;
   try {
-    while (!stream.eof()) {
-      stream >> key >> p0 >> p1 >> p2 >> p3;
+    char temp[255];
+    while (stream.getline(temp, 255)) {
+      stringstream ss(temp);
+      ss >> key >> p0 >> p1 >> p2 >> p3;
 
       int n = FindTOFChannelKey(key);
+      if (n == NOCALIB) // unknown channel in the calibration file, gracefully ignore
+	continue;
       _twPar[n].resize(4);
       _twPar[n][0] = p0;
       _twPar[n][1] = p1;
       _twPar[n][2] = p2;
       _twPar[n][3] = p3;
-      // std::cout<< key << " pos:" << n << "  p0:" << p0 << "  p1:" << p1 << std::endl;
+      // Squeak::mout(Squeak::info) << key << " pos:" << n
+      // << "  p0:" << p0 << "  p1:" << p1 << std::endl;
+      nkeys++;
     }
   } catch (MAUS::Exceptions::Exception e) {
     Squeak::mout(Squeak::error)
@@ -259,6 +293,8 @@
     return false;
   }
 
+  Squeak::mout(Squeak::info) << "Loaded TOF TW constants for " << nkeys << " channels." << endl;
+
   return true;
 }
 
@@ -272,13 +308,17 @@
   }
   TOFPixelKey Pkey;
   double dt;
+  int nkeys = 0;
   try {
-    while (!stream.eof()) {
-      stream >> Pkey >> dt;
+    char temp[255];
+    while (stream.getline(temp, 255)) {
+      stringstream ss(temp);
+      ss >> Pkey >> dt;
 
       _Tkey.push_back(Pkey);
       _Trt0.push_back(dt);
-      // std::cout<< Pkey << "  dt:" << dt << std::endl;
+      nkeys++;
+      // Squeak::mout(Squeak::info) << Pkey << "  dt:" << dt << std::endl;
     }
   } catch (MAUS::Exceptions::Exception e) {
     Squeak::mout(Squeak::error)
@@ -289,6 +329,9 @@
   // Use the last readed pixel key to set the number of the trigger station.
   _triggerStation = Pkey.station();
 
+  Squeak::mout(Squeak::info) << "Loaded TOF trigger delay constants for "
+			     << nkeys << " pixels." << endl;
+
   return true;
 }
 
@@ -348,7 +391,8 @@
     double p2 = _twPar[n][2]/x;
     double p3 =_twPar[n][3]/x2;
     double dt_tw = p1 + p2 + p3;
-    if (_twPar[n][0] && _twPar[n][1] && _twPar[n][2] && _twPar[n][3])
+    if ( _twPar[n][0] || _twPar[n][1] || _twPar[n][2] || _twPar[n][3] )
+      // when all 4 parameters 0, this channel was not calibrated
       return dt_tw;
   }
 
@@ -362,8 +406,8 @@
   double tw = TW(Pkey, adc);
   double t0 = T0(Pkey, reffSlab);
   double trt0 = TriggerT0(TrKey);
-  // std::cout << "TOFCalibrationMap -> "<< Pkey << " " << TrKey << "  tw = " << tw;
-  // std::cout << "  t0 = " << t0 << "  trt0 = " << trt0 << std::endl;
+  // Squeak::mout(Squeak::info) << "TOFCalibrationMap -> "<< Pkey << " " << TrKey << "  tw = " << tw
+  // 			     << "  t0 = " << t0 << "  trt0 = " << trt0 << std::endl;
   if (tw == NOCALIB || t0 == NOCALIB || trt0 == NOCALIB) {
     return NOCALIB;
   }