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

Removed FileInPath::isLocal to avoid user confusion #2648

Merged
merged 1 commit into from Feb 27, 2014
Merged

Removed FileInPath::isLocal to avoid user confusion #2648

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
3 changes: 0 additions & 3 deletions FWCore/ParameterSet/interface/FileInPath.h
View file
Open in desktop
Expand Up @@ -97,9 +97,6 @@ namespace edm
/// Where was the file found?
LocationCode location() const;

/// Was the file found under the "local" area?
bool isLocal() const;

/// Return a string that can be used to open the referenced
/// file.
///
Expand Down
6 changes: 0 additions & 6 deletions FWCore/ParameterSet/src/FileInPath.cc
View file
Open in desktop
Expand Up @@ -161,12 +161,6 @@ namespace edm
return location_;
}

bool
FileInPath::isLocal() const
{
return Local == location_;
}

std::string
FileInPath::fullPath() const
{
Expand Down
1 change: 0 additions & 1 deletion FWCore/PythonParameterSet/src/PythonModule.h
View file
Open in desktop
Expand Up @@ -62,7 +62,6 @@ BOOST_PYTHON_MODULE(libFWCoreParameterSet)
boost::python::class_<edm::FileInPath>("FileInPath", boost::python::init<std::string>())
.def("fullPath", &edm::FileInPath::fullPath)
.def("relativePath", &edm::FileInPath::relativePath)
.def("isLocal", &edm::FileInPath::isLocal)
;

boost::python::class_<edm::LuminosityBlockRange>("LuminosityBlockRange", boost::python::init<unsigned int, unsigned int, unsigned int, unsigned int>())
Expand Down
6 changes: 3 additions & 3 deletions FWCore/PythonParameterSet/test/makepset_t.cppunit.cc
View file
Open in desktop
Expand Up @@ -207,7 +207,7 @@ void testmakepset::fileinpathAux() {
char *releaseBase = getenv("CMSSW_RELEASE_BASE");
bool localArea = (releaseBase != 0 && strlen(releaseBase) != 0);
if(localArea) {
CPPUNIT_ASSERT(fip.isLocal() == true);
CPPUNIT_ASSERT(fip.location() == edm::FileInPath::Local);
}
CPPUNIT_ASSERT(fip.relativePath() == "FWCore/ParameterSet/python/Config.py");
CPPUNIT_ASSERT(ufip.relativePath() == "FWCore/ParameterSet/python/Types.py");
Expand All @@ -220,7 +220,7 @@ void testmakepset::fileinpathAux() {
std::string tmpout = fullpath.substr(0, fullpath.find("FWCore/ParameterSet/python/Config.py")) + "tmp.py";

edm::FileInPath topo = innerps.getParameter<edm::FileInPath>("topo");
CPPUNIT_ASSERT(topo.isLocal() == false);
CPPUNIT_ASSERT(topo.location() != edm::FileInPath::Local);
CPPUNIT_ASSERT(topo.relativePath() == "Geometry/TrackerSimData/data/trackersens.xml");
fullpath = topo.fullPath();
CPPUNIT_ASSERT(!fullpath.empty());
Expand Down Expand Up @@ -261,7 +261,7 @@ void testmakepset::fileinpathAux() {
edm::ParameterSet const& innerps2 = ps2->getParameterSet("main");
edm::FileInPath fip2 = innerps2.getParameter<edm::FileInPath>("fip2");
if (localArea) {
CPPUNIT_ASSERT(fip2.isLocal() == true);
CPPUNIT_ASSERT(fip2.location() == edm::FileInPath::Local);
}
CPPUNIT_ASSERT(fip2.relativePath() == "tmp.py");
std::string fullpath2 = fip2.fullPath();
Expand Down