slic/src
diff -u -r1.78 -r1.79
--- LcioManager.cc 6 Oct 2007 00:41:37 -0000 1.78
+++ LcioManager.cc 12 Oct 2007 01:49:47 -0000 1.79
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.78 2007/10/06 00:41:37 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.79 2007/10/12 01:49:47 jeremy Exp $
#include "LcioManager.hh"
// slic
@@ -190,11 +190,19 @@
string fullPath;
if (m_path.length() > 0) {
- fullPath = m_path + "./";
+ // Append the output directory if one exists.
+ fullPath = m_path;
+ }
+ else
+ {
+ // Default to the current directory if none specified.
+ fullPath = ".";
}
- fullPath += m_filename;
+ // Append file name.
+ fullPath += "/" + m_filename;
+ // Append extension.
if (withExtension) {
fullPath += ".slcio";
}
@@ -277,7 +285,7 @@
{
string det_tag = LCDDProcessor::instance()->getDetectorName();
m_runHdr->setDetectorName( det_tag );
- log().okay("Detector name set to <" + det_tag + "> in LCIO run header.");
+ log().okay("Detector name set to <" + det_tag + "> in run header.");
}
void LcioManager::deleteRunHeader()
@@ -302,14 +310,14 @@
void LcioManager::setPath(const string& path)
{
- log().okay("setPath: " + path);
+ log().okay("Set output directory to <" + path + ">.");
m_path = path;
}
void LcioManager::setFilename(const string& filename)
{
- log().okay("setFilename: " + filename);
+ log().okay("Set output file name to <" + filename + ">.");
m_filename = filename;
}
@@ -334,7 +342,7 @@
}
else {
setFilename( autoname );
- log().okay("Autoname set file name to <" + autoname + ">");
+ log().okay("Autoname set file name to <" + autoname + ">.");
}
}