ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitProd/TreeFiller/src/FillMitTree.cc

Comparing UserCode/MitProd/TreeFiller/src/FillMitTree.cc (file contents):
Revision 1.49 by bendavid, Tue Nov 3 14:02:32 2009 UTC vs.
Revision 1.51 by loizides, Wed Nov 25 14:45:40 2009 UTC

#	Line 4 | Line 4
4		#include "FWCore/MessageLogger/interface/MessageLogger.h"
5		#include "FWCore/ParameterSet/interface/ParameterSet.h"
6		#include "FWCore/ServiceRegistry/interface/Service.h"
7	–	#include "MitProd/TreeService/interface/TreeService.h"
7		#include "MitProd/ObjectService/interface/ObjectService.h"
8		#include "MitProd/TreeFiller/interface/AssociationMaps.h"
9		#include "MitProd/TreeFiller/interface/FillerBasicClusters.h"
#	Line 32 | Line 31
31		#include "MitProd/TreeFiller/interface/FillerPhotons.h"
32		#include "MitProd/TreeFiller/interface/FillerPixelHits.h"
33		#include "MitProd/TreeFiller/interface/FillerStableParts.h"
34	+	#include "MitProd/TreeFiller/interface/FillerStripHits.h"
35		#include "MitProd/TreeFiller/interface/FillerSuperClusters.h"
36		#include "MitProd/TreeFiller/interface/FillerTracks.h"
37		#include "MitProd/TreeFiller/interface/FillerVertexes.h"
#	Line 128 | Line 128 | void FillMitTree::beginJob(const edm::Ev
128		{
129		// Access the tree and book branches.
130
131	–	if (!tws_) {
132	–	throw edm::Exception(edm::errors::Configuration, "FillMitTree::beginJob()\n")
133	–	<< "Could not get pointer to tree. "
134	–	<< "Do you have the TreeServie define in your config?" << "\n";
135	–	return;
136	–	}
137	–
131		if (os_==0) { // only the first FillMitTree object has to deal with this
132		Service<ObjectService> os;
133		if (!os.isAvailable()) {
#	Line 302 | Line 295 | bool FillMitTree::configure(const edm::P
295		continue;
296		}
297
298	+	if (ftype.compare("FillerStripHits")==0) {
299	+	FillerStripHits *fillerStripHits =
300	+	new FillerStripHits(cfg, name.c_str(), defactive_);
301	+	addActiveFiller(fillerStripHits);
302	+	continue;
303	+	}
304	+
305		if (ftype.compare("FillerTracks")==0) {
306		FillerTracks *fillerTracks = new FillerTracks(cfg, name.c_str(), defactive_);
307		addActiveFiller(fillerTracks);
#	Line 380 | Line 380 | bool FillMitTree::configure(const edm::P
380		//--------------------------------------------------------------------------------------------------
381		bool FillMitTree::configureTreeWriter(const edm::ParameterSet &cfg)
382		{
383	+	// Configure tree writer with options from config file.
384
385		tws_->SetPrefix(cfg.getUntrackedParameter<string>("fileName","mit-test"));
386		tws_->SetBaseURL(cfg.getUntrackedParameter<string>("pathName","."));
#	Line 401 | Line 402 | bool FillMitTree::configureTreeWriter(co
402		if (cfg.exists("zipMode")   || cfg.exists("bZipThres") ||
403		cfg.exists("gZipThres") || cfg.exists("lzoThres")  ||
404		cfg.exists("lzmaThres")) {
405	<	edm::LogError("TreeService") << "OptIO interface not properly pre-loaded, "
406	<	"ignoring given settings." << std::endl;
405	>	edm::LogError("FillMitTree") <<
406	>	"OptIO interface not properly pre-loaded, ignoring given settings." << std::endl;
407		}
408		}
409

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines