From 8e4d39955bc045900cb408f19c2e16d3112e4210 Mon Sep 17 00:00:00 2001 From: alja Date: Thu, 16 Jan 2014 14:35:01 -0800 Subject: [PATCH] Import changes from pull #1070. --- Fireworks/Core/src/FWItemAccessorFactory.cc | 9 ++++----- Fireworks/Core/src/FWItemValueGetter.cc | 7 ++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Fireworks/Core/src/FWItemAccessorFactory.cc b/Fireworks/Core/src/FWItemAccessorFactory.cc index 7a448372dfea5..7e444d8e70b9b 100644 --- a/Fireworks/Core/src/FWItemAccessorFactory.cc +++ b/Fireworks/Core/src/FWItemAccessorFactory.cc @@ -8,7 +8,6 @@ // // Original Author: Chris Jones // Created: Sat Oct 18 14:48:14 EDT 2008 -// $Id: FWItemAccessorFactory.cc,v 1.15 2013/02/10 22:12:04 wmtan Exp $ // // system include files @@ -205,9 +204,9 @@ FWItemAccessorFactory::hasMemberTVirtualCollectionProxy(const TClass *iClass, bool FWItemAccessorFactory::hasAccessor(const TClass *iClass, std::string &result) { - const std::vector &available - = edmplugin::PluginManager::get()->categoryToInfos().find("cmsShow FWItemAccessorBase")->second; - + const std::vector &available + = edmplugin::PluginManager::get()->categoryToInfos().find("cmsShow FWItemAccessorBase")->second; + for (size_t i = 0, e = available.size(); i != e; ++i) { std::string name = available[i].name_; @@ -218,7 +217,7 @@ FWItemAccessorFactory::hasAccessor(const TClass *iClass, std::string &result) return true; } } - return false; + return false; } /** Helper method which checks if the object will be treated as a collection. diff --git a/Fireworks/Core/src/FWItemValueGetter.cc b/Fireworks/Core/src/FWItemValueGetter.cc index a5cb60a5f83de..e1920c1a6c2ce 100644 --- a/Fireworks/Core/src/FWItemValueGetter.cc +++ b/Fireworks/Core/src/FWItemValueGetter.cc @@ -8,7 +8,6 @@ // // Original Author: Chris Jones // Created: Sun Nov 30 16:15:43 EST 2008 -// $Id: FWItemValueGetter.cc,v 1.11 2012/12/02 09:49:59 amraktad Exp $ // // system include files @@ -53,6 +52,12 @@ FWItemValueGetter::FWItemValueGetter(const edm::TypeWithDict& iType, const std:: addEntry("y0", 2, "y", "cm"); addEntry("z0", 2, "z", "cm"); } + else if (strstr(iPurpose.c_str(), "Vertices") ) + { + addEntry("x", 2, "x", "cm"); + addEntry("y", 2, "y", "cm"); + addEntry("z", 2, "z", "cm"); + } else if (strstr(iPurpose.c_str(), "Conversion") ) { addEntry("pairMomentum().rho()", 1, "pt", "GeV" );