Skip to content

Commit 53e42a3

Browse files
committed
Fix all()
1 parent de52598 commit 53e42a3

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

docs/pages/example.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ histogram(regular(20, 0, 200, options=underflow | overflow))
103103
- Scale lepton energy scale by @f$\pm 2\,\%@f$ as systematic variations.
104104

105105
@cpp
106-
#include "qhep/Hist.h"
107-
#include "qhep/Tree.h"
106+
#include "HepQuery/Hist.h"
107+
#include "HepQuery/Tree.h"
108108

109109
#include "queryosity.h"
110110

@@ -162,7 +162,7 @@ int main() {
162162

163163
std::vector<std::string> tree_files{"hww.root"};
164164
std::string tree_name = "mini";
165-
auto ds = df.load(dataset::input<Tree>(tree_files, tree_name));
165+
auto ds = df.load(dataset::input<HepQ::Tree>(tree_files, tree_name));
166166

167167
// weights
168168
auto mc_weight = ds.read(dataset::column<float>("mcWeight"));
@@ -275,7 +275,7 @@ int main() {
275275
// ---------------------------------------------------------------------------
276276

277277
auto [pth_2los_sr, pth_2ldf_sr, pth_2lsf_sr] =
278-
df.make(query::plan<Hist<1, float>>("pth", 30, 0, 150))
278+
df.make(query::plan<HepQ::Hist<1, float>>("pth", 30, 0, 150))
279279
.fill(higgs_pt)
280280
.book(cut_2los_sr, cut_2ldf_sr, cut_2lsf_sr);
281281

@@ -324,8 +324,8 @@ int main() {
324324
3. Compute & plot their di-invariant mass, @f$ m_{ee} @f$.
325325

326326
@cpp
327-
#include "qhep/Event.h"
328-
#include "qhep/Hist.h"
327+
#include "HepQuery/Event.h"
328+
#include "HepQuery/Hist.h"
329329

330330
#include <xAODEventInfo/EventInfo.h>
331331
#include <xAODEgamma/ElectronContainer.h>
@@ -425,7 +425,7 @@ int main(int argc, char *argv[]) {
425425
.filter(column::expression(TwoElectrons), selectedElectrons);
426426

427427
auto selectedElectronsPtHist =
428-
df.make(query::plan<Hist<1,float>>("diElectronMass", 100, 0, 500))
428+
df.make(query::plan<HepQ::Hist<1,float>>("diElectronMass", 100, 0, 500))
429429
.fill(diElectronsMassGeV)
430430
.book(atLeastTwoSelectedElectrons);
431431

@@ -517,7 +517,7 @@ void task(int n) {
517517

518518
std::vector<std::string> tree_files{"Run2012B_SingleMu.root"};
519519
std::string tree_name = "Events";
520-
auto ds = df.load(dataset::input<Tree>(tree_files, tree_name));
520+
auto ds = df.load(dataset::input<HepQ::Tree>(tree_files, tree_name));
521521

522522
auto n_jet = ds.read(dataset::column<unsigned int>("nJet"));
523523
auto jets_pt = ds.read(dataset::column<VecF>("Jet_pt"));
@@ -559,7 +559,7 @@ void task(int n) {
559559
goodjet_mask);
560560

561561
auto h_sumpt_goodjet =
562-
df.make(query::plan<Hist<1, float>>("goodjet_sumpt", 185, 15, 200))
562+
df.make(query::plan<HepQ::Hist<1, float>>("goodjet_sumpt", 185, 15, 200))
563563
.fill(goodjet_sumpt)
564564
.book(cut_goodjet);
565565

include/queryosity/dataflow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ template <typename Col> auto queryosity::dataflow::weight(Col const &col) {
535535
return syst;
536536
}
537537

538-
auto queryosity::dataflow::all() -> lazy<selection::node> {
538+
inline auto queryosity::dataflow::all() -> lazy<selection::node> {
539539
if (!m_all) {
540540
m_all = std::make_unique<lazy<selection::node>>(
541541
this->filter(column::constant(true)));

0 commit comments

Comments
 (0)