saving progress before using multithreading in gstreamer example

Author: maureeungaro

eventDispenser/eventDispenser.cc

@@ -26,6 +26,8 @@
 #include "eventDispenserConventions.h"
 #include "eventDispenser_options.h"
 #include "eventDispenser.h"
+#include "gdynamicdigitizationConventions.h"
+
 
 // c++
 #include <fstream>
@@ -63,7 +65,7 @@ EventDispenser::EventDispenser(GOptions *gopt, map<string, GDynamicDigitization
 		// A filename was specified; attempt to open the run weights input file.
 		ifstream in(filename.c_str());
 		if (!in) {
-			log->error(EC__EVENTDISTRIBUTIONFILENOTFOUND, "Error: can't open run weights input file ", filename, ". Check your spelling. Exiting.");
+			log->error(ERR_EVENTDISTRIBUTIONFILENOTFOUND, "Error: can't open run weights input file ", filename, ". Check your spelling. Exiting.");
 		} else {
 			log->info(1, "Loading run weights from ", filename);
 			// Fill the run weight map by reading each line from the file.
@@ -154,10 +156,14 @@ int EventDispenser::processEvents() {
 		if (runNumber != currentRunno) {
 			for (auto [digitizationName, digiRoutine] : (*gDigitizationGlobal)) {
 				log->debug(NORMAL, "Calling ", digitizationName, " loadConstants for run ", runNumber);
-				digiRoutine->loadConstants(runNumber, variation);
+				if (digiRoutine->loadConstants(runNumber, variation) == false) {
+					log->error(ERR_LOADCONSTANTFAIL, "Failed to load constants for ", digitizationName, " for run ", runNumber, " with variation ", variation);
+				}
 
 				log->debug(NORMAL, "Calling ", digitizationName, " loadTT for run ", runNumber);
-				digiRoutine->loadTT(runNumber, variation);
+				if (digiRoutine->loadTT(runNumber, variation) == false) {
+					log->error(ERR_LOADTTFAIL, "Failed to load translation table for ", digitizationName, " for run ", runNumber, " with variation ", variation);
+				}
 			}
 			currentRunno = runNumber;
 		}

eventDispenser/eventDispenserConventions.h

@@ -1,8 +1,6 @@
 #pragma once
 
-#define EVENTDISPENSERLOGMSGITEM  " ⋿"
-
 // error codes in the 700s
-#define EC__EVENTDISTRIBUTIONFILENOTFOUND 701
+#define ERR_EVENTDISTRIBUTIONFILENOTFOUND 701
 
 

g4dialog/gui_session.cc

@@ -1,5 +1,5 @@
 #include "gui_session.h"
-#include "../g4dialog_options.h" // Provides G4DIALOG_LOGGER constant and option definitions
+#include "g4dialog_options.h" // Provides G4DIALOG_LOGGER constant and option definitions
 
 #include <QRegularExpression>
 

g4dialog/meson.build

@@ -32,7 +32,7 @@ if get_option('i_test')
         'headers' : headers,
         'moc_headers' : moc_headers,
         'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
-        'additional_includes' : ['g4dialog/tabs'],
+        'additional_includes' : ['g4dialog', 'g4dialog/tabs'],
         'examples' : examples
     }
 else
@@ -42,6 +42,6 @@ else
         'headers' : headers,
         'moc_headers' : moc_headers,
         'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
-        'additional_includes' : ['g4dialog/tabs']
+        'additional_includes' : ['g4dialog', 'g4dialog/tabs'],
     }
 endif

g4dialog/tabs/gboard.cc

@@ -1,7 +1,7 @@
 // G4Dialog
 #include "gboard.h"
-#include "../gui_session.h"
-#include "../g4dialog_options.h" // Provides G4DIALOG_LOGGER constant and option definitions
+#include "gui_session.h"
+#include "g4dialog_options.h" // Provides G4DIALOG_LOGGER constant and option definitions
 
 
 

g4display/meson.build

@@ -40,7 +40,7 @@ if get_option('i_test')
         'moc_headers' : moc_headers,
         'qrc_examples_sources' : qrc_examples_sources,
         'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps, ogl_deps, sqlite_dep],
-        'additional_includes' : ['g4display/tabs'],
+        'additional_includes' : ['g4display', 'g4display/tabs'],
         'examples' : examples
     }
 else
@@ -50,6 +50,6 @@ else
         'headers' : headers,
         'moc_headers' : moc_headers,
         'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps, ogl_deps, sqlite_dep],
-        'additional_includes' : ['g4display/tabs']
+        'additional_includes' : ['g4display', 'g4display/tabs'],
     }
 endif

g4display/tabs/g4displayview.cc

@@ -1,5 +1,5 @@
 #include "g4displayview.h"
-#include "../g4display_options.h"
+#include "g4display_options.h"
 #include "gutilities.h"
 
 using namespace g4display;

gdata/event/gDigitizedData.cc

@@ -4,7 +4,7 @@
  */
 
 #include "gDigitizedData.h"
-#include "../gdataConventions.h"
+#include "gdataConventions.h"
 #include <string>
 #include <map>
 #include <vector>
@@ -71,14 +71,14 @@ int GDigitizedData::getTimeAtElectronics() {
 
 int GDigitizedData::getIntObservable(const std::string& varName) {
 	if (intObservablesMap.find(varName) == intObservablesMap.end()) {
-		log->error(EC__VARIABLENOTFOUND, "variable name <" + varName + "> not found in GDigitizedData::intObservablesMap");
+		log->error(ERR_VARIABLENOTFOUND, "variable name <" + varName + "> not found in GDigitizedData::intObservablesMap");
 	}
 	return intObservablesMap[varName];
 }
 
 double GDigitizedData::getDblObservable(const std::string& varName) {
 	if (doubleObservablesMap.find(varName) == doubleObservablesMap.end()) {
-		log->error(EC__VARIABLENOTFOUND, "variable name <" + varName + "> not found in GDigitizedData::doubleObservablesMap");
+		log->error(ERR_VARIABLENOTFOUND, "variable name <" + varName + "> not found in GDigitizedData::doubleObservablesMap");
 	}
 	return doubleObservablesMap[varName];
 }

gdata/frame/gFrameDataCollection.h

@@ -9,7 +9,7 @@
 
 #include "gFrameDataCollectionHeader.h"
 #include "gIntegralPayload.h"
-#include "../gdataConventions.h"
+#include "gdataConventions.h"
 #include <vector>
 #include <string>
 
@@ -59,7 +59,7 @@ class GFrameDataCollection {
 			log->debug(NORMAL, " adding integral payload for crate ", crate, " slot ", slot, " channel ", channel,
 			           " charge ", charge, " time ", time);
 		}
-		else { log->error(EC__WRONGPAYLOAD, "payload size is not 5 but ", payload.size()); }
+		else { log->error(ERR_WRONGPAYLOAD, "payload size is not 5 but ", payload.size()); }
 	}
 
 	// Placeholder: Add event-specific data.

gdata/gdataConventions.h

@@ -18,9 +18,9 @@
  * The constants below are used for error reporting and as string identifiers in various modules.
  */
 
-constexpr int EC__GSDETECTORNOTFOUND = 601;    ///< Exit code when a detector is not found.
-constexpr int EC__VARIABLENOTFOUND   = 602;      ///< Exit code when a variable is not found.
-constexpr int EC__WRONGPAYLOAD       = 603;      ///< Exit code when a payload is of the wrong size.
+constexpr int ERR_GSDETECTORNOTFOUND = 601;    ///< Exit code when a detector is not found.
+constexpr int ERR_VARIABLENOTFOUND   = 602;      ///< Exit code when a variable is not found.
+constexpr int ERR_WRONGPAYLOAD       = 603;      ///< Exit code when a payload is of the wrong size.
 
 constexpr const char* CRATESTRINGID         = "crate";                ///< Identifier for crate.
 constexpr const char* SLOTSTRINGID          = "slot";                 ///< Identifier for slot.