--- UserCode/MitProd/TreeFiller/interface/FillMitTree.h	2008/06/18 13:23:22	1.1
+++ UserCode/MitProd/TreeFiller/interface/FillMitTree.h	2008/07/01 21:11:47	1.6
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------------------------------------------
-// $Id: FillMitTree.h,v 1.1 2008/06/18 13:23:22 paus Exp $
+// $Id: FillMitTree.h,v 1.6 2008/07/01 21:11:47 loizides Exp $
 //
 // FillMitTree
 //
@@ -10,6 +10,7 @@
 //
 // Authors: C.Paus
 //--------------------------------------------------------------------------------------------------
+
 #ifndef TREEFILLER_FILLMITTREE_H
 #define TREEFILLER_FILLMITTREE_H
 
@@ -17,31 +18,25 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "MitAna/DataUtil/interface/TreeWriter.h"
-#include "MitProd/TreeService/interface/TreeService.h"
 #include "MitProd/TreeFiller/interface/BaseFiller.h"
 
 namespace mithep 
 {
-  class FillerGlobalMuons;
-
   class FillMitTree : public edm::EDAnalyzer
   {
     public:
-      FillMitTree(const edm::ParameterSet&);
+      FillMitTree(const edm::ParameterSet &cfg);
       ~FillMitTree();
 
-      void analyze (const edm::Event&, const edm::EventSetup&);
-      void beginJob(edm::EventSetup const&);
-      void endJob  ();
+      void analyze (const edm::Event &e, const edm::EventSetup &es);
+      void beginJob(const edm::EventSetup &es);
+      void endJob();
   
-    private:
-      // list of our fillers and potential fillers
-      std::vector<BaseFiller*>  fillers_;
-      FillerGlobalMuons        *fillerGlobalMuons_;
-      
-      // parameters for service
-      std::vector<std::string>  branchNames_;   // names of the fillers to be activated
+    protected:
+      bool configure(const edm::ParameterSet &cfg);
+
+      std::vector<BaseFiller*> fillers_;       //list of active fillers
+      bool                     defactive_;     //default activity flag for fillers
   };
 }
 #endif