reindenting

Author: maureeungaro

gdata/gDataCollection.h

@@ -16,61 +16,99 @@
 #include <vector>
 
 
-class GDataCollection {
+class GDataCollection
+{
 public:
-	/**
-	 * \brief Constructs a GDataCollection.
-	 * \param logger Pointer to a GLogger instance.
-	 */
-	explicit GDataCollection(){}
+    /**
+     * \brief Constructs a GDataCollection.
+     */
+    explicit GDataCollection() = default;
 
-	/**
-	 * \brief Destructor for GDataCollection.
-	 *
-	 * Smart pointers clean up automatically.
-	 */
 
-	/**
-	 * \brief Adds true hit information data.
-	 * \param data Unique pointer to GTrueInfoData.
-	 */
-	void addTrueInfoData(std::unique_ptr<GTrueInfoData> data) {
-		trueInfosData.push_back(std::move(data)); // taking ownership of the unique_ptr
-	}
+    /**
+     * \brief Destructor for GDataCollection.
+     *
+     * Smart pointers clean up automatically.
+     */
 
-	/**
-	 * \brief Adds digitized hit data.
-	 * \param data Unique pointer to GDigitizedData.
-	 */
-	void addDigitizedData(std::unique_ptr<GDigitizedData> data) {
-		digitizedData.push_back(std::move(data)); // taking ownership of the unique_ptr
-	}
+    /**
+     * \brief Adds true hit information data.
+     * \param data Unique pointer to GTrueInfoData.
+     */
+    void addTrueInfoData(std::unique_ptr<GTrueInfoData> data) {
+        trueInfosData.push_back(std::move(data)); // taking ownership of the unique_ptr
+    }
 
-	/**
-	 * \brief Provides read-only access to the stored true hit data.
-	 *
-	 * Returns a constant reference to the internal vector of unique pointers
-	 * to GTrueInfoData objects. Ownership of the data remains with this class.
-	 * Callers may inspect the data via the pointers but must not modify or
-	 * take ownership of them.
-	 *
-	 * \return Const reference to the vector of unique_ptr<GTrueInfoData>.
-	 */
-	[[nodiscard]] inline const std::vector<std::unique_ptr<GTrueInfoData>>& getTrueInfoData() const { return trueInfosData; }
+    // sum existing data
+    void collectTrueInfosData(std::unique_ptr<GTrueInfoData> data) {
+        // first event
+        if (trueInfosData.empty()) {
+            trueInfosData.push_back(std::move(data));
+        }
+        else {
+            for (const auto& [varName, value] : data->getDoubleVariablesMap()) {
+                trueInfosData.front()->accumulateVariable(varName, value);
+            }
+            for (const auto& [varName, value] : data->getStringVariablesMap()) {
+                trueInfosData.front()->accumulateVariable(varName, value);
+            }
+        }
+    }
 
-	/**
-	 * \brief Provides read-only access to the stored digitized hit data.
-	 *
-	 * Returns a constant reference to the internal vector of unique pointers
-	 * to GDigitizedData objects. Ownership of the data remains with this class.
-	 * Callers may read the data but must not modify or transfer ownership.
-	 *
-	 * \return Const reference to the vector of unique_ptr<GDigitizedData>.
-	 */
-	[[nodiscard]] inline const std::vector<std::unique_ptr<GDigitizedData>>& getDigitizedData() const { return digitizedData; }
+    void collectDigitizedData(std::unique_ptr<GDigitizedData> data) {
+        // first event
+        if (digitizedData.empty()) {
+            digitizedData.push_back(std::move(data));
+        }
+        else {
+            // argument passed: 0: do not get SRO var
+            for (const auto& [varName, value] : data->getIntObservablesMap(0)) {
+                digitizedData.front()->accumulateVariable(varName, value);
+            }
+            for (const auto& [varName, value] : data->getDblObservablesMap(0)) {
+                digitizedData.front()->accumulateVariable(varName, value);
+            }
+        }
+    }
 
-private:
-	std::vector<std::unique_ptr<GTrueInfoData>>  trueInfosData; ///< Vector of true hit data.
-	std::vector<std::unique_ptr<GDigitizedData>> digitizedData; ///< Vector of digitized hit data.
 
+    /**
+     * \brief Adds digitized hit data.
+     * \param data Unique pointer to GDigitizedData.
+     */
+    void addDigitizedData(std::unique_ptr<GDigitizedData> data) {
+        digitizedData.push_back(std::move(data)); // taking ownership of the unique_ptr
+    }
+
+    /**
+     * \brief Provides read-only access to the stored true hit data.
+     *
+     * Returns a constant reference to the internal vector of unique pointers
+     * to GTrueInfoData objects. Ownership of the data remains with this class.
+     * Callers may inspect the data via the pointers but must not modify or
+     * take ownership of them.
+     *
+     * \return Const reference to the vector of unique_ptr<GTrueInfoData>.
+     */
+    [[nodiscard]] inline const std::vector<std::unique_ptr<GTrueInfoData>>& getTrueInfoData() const {
+        return trueInfosData;
+    }
+
+    /**
+     * \brief Provides read-only access to the stored digitized hit data.
+     *
+     * Returns a constant reference to the internal vector of unique pointers
+     * to GDigitizedData objects. Ownership of the data remains with this class.
+     * Callers may read the data but must not modify or transfer ownership.
+     *
+     * \return Const reference to the vector of unique_ptr<GDigitizedData>.
+     */
+    [[nodiscard]] inline const std::vector<std::unique_ptr<GDigitizedData>>& getDigitizedData() const {
+        return digitizedData;
+    }
+
+private:
+    // for event data, the array index is the hit index
+    std::vector<std::unique_ptr<GTrueInfoData>>  trueInfosData; ///< Vector of true data.
+    std::vector<std::unique_ptr<GDigitizedData>> digitizedData; ///< Vector of digitized data.
 };