Merge pull request #85 from blinkseb/transient_branches

Make pruned particles branches transient (closes #83)
cp3-llbb · Oct 16, 2015 · b400935 · b400935
2 parents bce98a2 + 4d196d6
commit b400935
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/interface/GenParticlesProducer.h b/interface/GenParticlesProducer.h
@@ -36,12 +36,12 @@ class GenParticlesProducer: public Framework::Producer {
 
     public:
         // Tree members
-        std::vector<LorentzVector>& packed_p4 = tree_packed["p4"].write<std::vector<LorentzVector>>();
-        std::vector<float>& packed_y = tree_packed["y"].write<std::vector<float>>();
-        std::vector<int16_t>& packed_pdg_id = tree_packed["pdg_id"].write<std::vector<int16_t>>();
-        std::vector<int8_t>& packed_status = tree_packed["status"].write<std::vector<int8_t>>();
-        std::vector<int16_t>& packed_status_flags = tree_packed["status_flags"].write<std::vector<int16_t>>();
-        std::vector<std::vector<uint16_t>>& packed_mothers_index = tree_packed["mothers_index"].write<std::vector<std::vector<uint16_t>>>();
+        std::vector<LorentzVector>& packed_p4 = tree_packed["p4"].transient_write<std::vector<LorentzVector>>();
+        std::vector<float>& packed_y = tree_packed["y"].transient_write<std::vector<float>>();
+        std::vector<int16_t>& packed_pdg_id = tree_packed["pdg_id"].transient_write<std::vector<int16_t>>();
+        std::vector<int8_t>& packed_status = tree_packed["status"].transient_write<std::vector<int8_t>>();
+        std::vector<int16_t>& packed_status_flags = tree_packed["status_flags"].transient_write<std::vector<int16_t>>();
+        std::vector<std::vector<uint16_t>>& packed_mothers_index = tree_packed["mothers_index"].transient_write<std::vector<std::vector<uint16_t>>>();
 
         std::vector<LorentzVector>& pruned_p4 = tree_pruned["p4"].write<std::vector<LorentzVector>>();
         std::vector<float>& pruned_y = tree_pruned["y"].write<std::vector<float>>();

diff --git a/interface/Types.h b/interface/Types.h
@@ -3,5 +3,6 @@
 #include <Math/Vector4D.h>
 
 #define BRANCH(NAME, ...) __VA_ARGS__& NAME = tree[#NAME].write<__VA_ARGS__>()
+#define TRANSIENT_BRANCH(NAME, ...) __VA_ARGS__& NAME = tree[#NAME].transient_write<__VA_ARGS__>()
 
 typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiE4D<float>> LorentzVector;