Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Redo pull #1070 because of conflict with 6_2_X merge #2051

Merged
merged 1 commit into from Feb 4, 2014
Merged

Redo pull #1070 because of conflict with 6_2_X merge #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions Fireworks/Core/src/FWItemAccessorFactory.cc
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -205,9 +204,9 @@ FWItemAccessorFactory::hasMemberTVirtualCollectionProxy(const TClass *iClass,
bool
FWItemAccessorFactory::hasAccessor(const TClass *iClass, std::string &result)
{
const std::vector<edmplugin::PluginInfo> &available
= edmplugin::PluginManager::get()->categoryToInfos().find("cmsShow FWItemAccessorBase")->second;

const std::vector<edmplugin::PluginInfo> &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_;
Expand All @@ -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.
Expand Down
7 changes: 6 additions & 1 deletion Fireworks/Core/src/FWItemValueGetter.cc
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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" );
Expand Down