[Rivet-svn] rivet: 7 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/388ae0071ffa
branches:  
changeset: 6176:388ae0071ffa
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 18 19:09:31 2017 +0000
description:
Use faster data-file installation method... is it sufficiently portable?

details:   https://rivet.hepforge.org/hg/rivet/rev/094ae4110abd
branches:  
changeset: 6177:094ae4110abd
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 18 19:11:01 2017 +0000
description:
Cosmetics

details:   https://rivet.hepforge.org/hg/rivet/rev/c9e8f95fad6f
branches:  
changeset: 6178:c9e8f95fad6f
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 18 19:11:31 2017 +0000
description:
Debug message

details:   https://rivet.hepforge.org/hg/rivet/rev/d5eaf4984d22
branches:  
changeset: 6179:d5eaf4984d22
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 18 19:11:58 2017 +0000
description:
Removing pointless debug message

details:   https://rivet.hepforge.org/hg/rivet/rev/e2dccdf35d63
branches:  
changeset: 6180:e2dccdf35d63
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 18 19:12:39 2017 +0000
description:
Adding (commented) old code for comparisons

details:   https://rivet.hepforge.org/hg/rivet/rev/761f8fe894d7
branches:  
changeset: 6181:761f8fe894d7
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 18 19:13:09 2017 +0000
description:
Debug/trace message improvements

details:   https://rivet.hepforge.org/hg/rivet/rev/bb5e1f22c8de
branches:  
changeset: 6182:bb5e1f22c8de
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Dec 18 19:36:22 2017 +0000
description:
Add debug/trace printout in VetoedFinalState remaining-FS vetoing process

diffs (truncated from 268 to 50 lines):

--- a/analyses/Makefile.am	Wed Dec 13 16:54:58 2017 +0000
+++ b/analyses/Makefile.am	Mon Dec 18 19:36:22 2017 +0000
@@ -41,7 +41,9 @@
 
 install-data-local: $(PLUGIN_DATAFILES)
 	@echo "Installing analysis data files..."
-	@$(install_sh_DATA) $^ $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
+	cp $(abs_srcdir)/plugin*/*.{info,plot,yoda} $(DESTDIR)$(pkgdatadir)/
+#@$(install_sh_DATA) $^ $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	cd $(DESTDIR)$(libdir) && rm -f $(PLUGIN_LIBS)
--- a/analyses/pluginATLAS/ATLAS_2013_I1230812.cc	Wed Dec 13 16:54:58 2017 +0000
+++ b/analyses/pluginATLAS/ATLAS_2013_I1230812.cc	Mon Dec 18 19:36:22 2017 +0000
@@ -34,17 +34,16 @@
       Cut pt20 = Cuts::pT >= 20.0*GeV;
       if (_mode == 1) {
         // Combined
-	Cut eta_comb = Cuts::abseta < 2.5;
-	ZFinder zfinder(PromptFinalState(eta_comb), pt20, PID::ELECTRON, 66*GeV, 116*GeV);
+        ZFinder zfinder(FinalState(Cuts::abseta < 2.5), pt20, PID::ELECTRON, 66*GeV, 116*GeV);
         declare(zfinder, "zfinder");
       } else if (_mode == 2) {
         // Electron
-	    Cut eta_e = Cuts::abseta < 1.37 || Cuts::absetaIn(1.52, 2.47);
-        ZFinder zfinder(PromptFinalState(eta_e), pt20, PID::ELECTRON, 66*GeV, 116*GeV);
+	    const Cut eta_e = Cuts::abseta < 1.37 || Cuts::absetaIn(1.52, 2.47);
+        ZFinder zfinder(FinalState(eta_e), pt20, PID::ELECTRON, 66*GeV, 116*GeV);
         declare(zfinder, "zfinder");
       } else if (_mode == 3) {
         // Muon
-        ZFinder zfinder(PromptFinalState(Cuts::abseta < 2.4), pt20, PID::MUON, 66*GeV, 116*GeV);
+        ZFinder zfinder(FinalState(Cuts::abseta < 2.4), pt20, PID::MUON, 66*GeV, 116*GeV);
         declare(zfinder, "zfinder");
       } else {
         MSG_ERROR("Unknown decay channel mode!!!");
@@ -92,21 +91,17 @@
     void analyze(const Event& event) {
 
       const ZFinder& zfinder = apply<ZFinder>(event, "zfinder");
-      if (zfinder.constituents().size()!=2) vetoEvent;
+      MSG_DEBUG("# Z constituents = " << zfinder.constituents().size());
+      if (zfinder.constituents().size() != 2) vetoEvent;
 
-      FourMomentum z = zfinder.bosons()[0].momentum();
+      FourMomentum z = zfinder.boson().momentum();
       FourMomentum lp = zfinder.constituents()[0].momentum();
       FourMomentum lm = zfinder.constituents()[1].momentum();
-      if (deltaR(lp, lm)<0.2) vetoEvent;