more safe cast of double into int and bool

Author: lubynets

infra/PlainTreeFiller.cpp

@@ -89,8 +89,10 @@ void PlainTreeFiller::Init() {
     if (!is_prepend_leaves_with_branchname_) leaf_name.erase(0, branch_name_.size() + 1);
     std::replace(leaf_name.begin(), leaf_name.end(), '.', '_');
     if (vars_.at(i).type_ == Types::kFloat) plain_tree_->Branch(leaf_name.c_str(), &vars_.at(i).float_, Form("%s/F", leaf_name.c_str()));
-    if (vars_.at(i).type_ == Types::kInteger) plain_tree_->Branch(leaf_name.c_str(), &vars_.at(i).int_, Form("%s/I", leaf_name.c_str()));
-    if (vars_.at(i).type_ == Types::kBool) plain_tree_->Branch(leaf_name.c_str(), &vars_.at(i).bool_, Form("%s/O", leaf_name.c_str()));
+    else if (vars_.at(i).type_ == Types::kInteger)
+      plain_tree_->Branch(leaf_name.c_str(), &vars_.at(i).int_, Form("%s/I", leaf_name.c_str()));
+    else if (vars_.at(i).type_ == Types::kBool)
+      plain_tree_->Branch(leaf_name.c_str(), &vars_.at(i).bool_, Form("%s/O", leaf_name.c_str()));
   }
 
   for (auto& cm : cuts_map_) {
@@ -107,8 +109,10 @@ void PlainTreeFiller::Exec() {
     assert(channel.size() == vars_.size());
     for (size_t i = 0; i < channel.size(); ++i) {
       if (vars_.at(i).type_ == Types::kFloat) vars_.at(i).float_ = static_cast<float>(channel.at(i));
-      if (vars_.at(i).type_ == Types::kInteger) vars_.at(i).int_ = static_cast<int>(channel.at(i));
-      if (vars_.at(i).type_ == Types::kBool) vars_.at(i).bool_ = static_cast<bool>(channel.at(i));
+      else if (vars_.at(i).type_ == Types::kInteger)
+        vars_.at(i).int_ = static_cast<int>(std::round(channel.at(i)));
+      else if (vars_.at(i).type_ == Types::kBool)
+        vars_.at(i).bool_ = static_cast<bool>(std::round(channel.at(i)));
     }
     plain_tree_->Fill();
   }