Commits

Anonymous committed fa9e4c6 Merge

sync w/ atlasoff

Comments (0)

Files changed (4)

File contents unchanged.
File contents unchanged.

src/RootNtupleOutputStream.cxx

   : FilteredAlgorithm(name, pSvcLocator),
     m_dataStore("StoreGateSvc", name),
     m_pCLIDSvc("ClassIDSvc", name),
-    // m_p2BWritten(string("SG::Folder/") + name + string("_TopFolder"), this),
-    // m_decoder(string("SG::Folder/") + name + string("_excluded"), this),
     m_streamer(std::string("AthenaOutputStreamTool/") + 
 	       name + std::string("Tool"), this),
    m_helperTools(this) 
   declareProperty("WriteOnExecute",         m_writeOnExecute=true);
   declareProperty("WriteOnFinalize",        m_writeOnFinalize=false);
   declareProperty("TakeItemsFromInput",     m_itemListFromTool=false);
-  // declareProperty("CheckNumberOfWrites",    m_checkNumberOfWrites=true);
-  declareProperty("CommitOnStop",           m_commitOnStop=false);
-  //declareProperty("ExcludeList",            m_excludeList);
   declareProperty("HelperTools",            m_helperTools);
 
   declareProperty("DynamicItemList",
        if (!write().isSuccess()) {  // true mean write AND commit
 	 ATH_MSG_ERROR("Cannot write on finalize");
        }
-     } else if (m_commitOnStop) {
-       // If we don't write on finalize, do final commit if requested
-       if (m_streamer->connectOutput(m_outputName).isFailure()) {
-	 ATH_MSG_ERROR("Cannot connect to output file: " << m_outputName);
-       } else if (m_streamer->commitOutput().isFailure()) {
-	 ATH_MSG_ERROR("commit failed!");
-       } else {
-	 ATH_MSG_INFO("Did final commit");
-       }
      }
    }
    ATH_MSG_INFO("Records written: " << m_events);

src/RootNtupleOutputStream.h

   bool m_writeOnFinalize;
   /// set to write out everything from input DataHeader
   bool m_itemListFromTool;
-  // /// set to true to check for number of times each object is written
-  // bool m_checkNumberOfWrites;
-  /// set to true to assure an extra commit on stop 
-  bool m_commitOnStop;
-  // /// map to record number of writes per object
-  // typedef std::map<std::string, unsigned int>  CounterMapType;
-  // CounterMapType  m_objectWriteCounter;
 
   /// dynamic output itemlist: 
   ///   if enabled rediscover object list to be written out at each event