rename variable

rest-for-physics · Aug 18, 2024 · eb68e29 · eb68e29
1 parent 9abd7a1
commit eb68e29
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/root/storage.cpp b/src/root/storage.cpp
@@ -54,7 +54,7 @@ void StorageManager::Initialize(const string& filename) {
 
     event_tree->Branch("timestamp", &event.timestamp);
     event_tree->Branch("signal_ids", &event.signal_ids);
-    event_tree->Branch("signal_data", &event.signal_data);
+    event_tree->Branch("signal_values", &event.signal_values);
 
     run_tree = std::make_unique<TTree>("run", "Run metadata");
 
@@ -109,12 +109,12 @@ std::pair<unsigned short, std::array<unsigned short, MAX_POINTS>> Event::get_sig
     unsigned short channel = signal_ids[index];
     std::array<unsigned short, MAX_POINTS> data{};
     for (size_t i = 0; i < MAX_POINTS; ++i) {
-        data[i] = signal_data[index * 512 + i];
+        data[i] = signal_values[index * 512 + i];
     }
     return {channel, data};
 }
 
 void Event::add_signal(unsigned short id, const array<unsigned short, MAX_POINTS>& data) {
     signal_ids.push_back(id);
-    signal_data.insert(signal_data.end(), data.begin(), data.end());
+    signal_values.insert(signal_values.end(), data.begin(), data.end());
 }
diff --git a/src/root/storage.h b/src/root/storage.h
@@ -18,24 +18,24 @@ class Event {
     unsigned long long timestamp = 0;
     unsigned int id = 0;
     std::vector<unsigned short> signal_ids;
-    std::vector<unsigned short> signal_data; // all data points from all signals concatenated (same order as signal_ids)
+    std::vector<unsigned short> signal_values; // all data points from all signals concatenated (same order as signal_ids)
 
     Event() {
         // reserve space for the maximum number of signals and points
         signal_ids.reserve(MAX_SIGNALS);
-        signal_data.reserve(MAX_POINTS * MAX_POINTS);
+        signal_values.reserve(MAX_POINTS * MAX_POINTS);
     }
 
     void clear() {
         timestamp = 0;
         id = 0;
         signal_ids.clear();
-        signal_data.clear();
+        signal_values.clear();
     }
 
     void shrink_to_fit() {
         signal_ids.shrink_to_fit();
-        signal_data.shrink_to_fit();
+        signal_values.shrink_to_fit();
     }
 
     size_t size() const {

diff --git a/viewer/feminos-viewer.py b/viewer/feminos-viewer.py
@@ -33,13 +33,13 @@ def get_event(tree: uproot.TTree, entry: int):
         raise ValueError(f"Entry {entry} is out of bounds. Tree has {tree.num_entries} entries.")
 
     events = tree.arrays(entry_start=entry, entry_stop=entry + 1)
-    events["signal_data"] = ak.unflatten(events["signal_data"], 512, axis=1)
+    events["signal_values"] = ak.unflatten(events["signal_values"], 512, axis=1)
 
-    signals = ak.Array({"id": events["signal_ids"], "data": events["signal_data"]}, with_name="Signals")
+    signals = ak.Array({"id": events["signal_ids"], "data": events["signal_values"]}, with_name="Signals")
     events["signals"] = signals
 
     events = ak.without_field(events, "signal_ids")
-    events = ak.without_field(events, "signal_data")
+    events = ak.without_field(events, "signal_values")
 
     return events[0]