ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitAna/TAM/src/TAMOutput.cxx

Comparing UserCode/MitAna/TAM/src/TAMOutput.cxx (file contents):
Revision 1.5 by loizides, Mon Jul 13 19:19:44 2009 UTC vs.
Revision 1.8 by paus, Fri Mar 30 01:08:39 2012 UTC

#	Line 2 | Line 2
2		// $Id$
3		//
4
5	<	#include "TAMOutput.h"
5	>	#include "MitAna/TAM/interface/TAMOutput.h"
6
7
8		#ifndef G__API_H
#	Line 32 | Line 32
32		#ifndef ROOT_TDataMember
33		#include "TDataMember.h"
34		#endif
35	<	#ifndef TAM_TAModule
36	<	#include "TAModule.h"
37	<	#endif
38	<	#ifndef TAM_TDirectory
35	>	#ifndef ROOT_TDirectory
36		#include "TDirectory.h"
37		#endif
38	+	#ifndef TAM_TAModule
39	+	#include "MitAna/TAM/interface/TAModule.h"
40	+	#endif
41
42		//////////////////////////////////////////////////////////////////////////
43		//                                                                      //
#	Line 491 | Line 491 | void TAMOutput::ls(Option_t* option) con
491
492
493		//______________________________________________________________________________
494	<	void TAMOutput::Merge(TCollection* list)
494	>	Long64_t TAMOutput::Merge(TCollection* list)
495		{
496		// Called by Proof after SlaveTerminate() and before Terminate()
497		// to merge the output objects from each worker ("slave") computer.
#	Line 499 | Line 499 | void TAMOutput::Merge(TCollection* list)
499		// recursively proceed through the sub modules to merge their objects.
500
501		// merge this module's output objects
502	<	MergeOutput(list);
502	>	Long64_t mergeCount = MergeOutput(list);
503
504		// then merge its sub modules' objects:
505		if (!IsEmpty()) { // (if we have any sub modules)
#	Line 532 | Line 532 | void TAMOutput::Merge(TCollection* list)
532		DeleteIterators(slaveIters);
533		}
534
535	+	return mergeCount;
536		}
537
538
539		//______________________________________________________________________________
540	<	void TAMOutput::MergeOutput(TCollection* list)
540	>	Long64_t TAMOutput::MergeOutput(TCollection* list)
541		{
542		// Merges the actual output objects in fCurOutput given a list of
543		// all the TAMOutput objects from the worker computers that
#	Line 574 | Line 575 | void TAMOutput::MergeOutput(TCollection*
575		DeleteIterators(slaveIters);
576		}
577
578	+	return list->GetEntries();
579		}
580
581
#	Line 648 | Line 650 | void TAMOutput::SetOutputMembers(const B
650		// first update the addresses of the members
651		Char_t parent[kParentStrLen];
652		memset(parent, 0, kParentStrLen * sizeof(Char_t));
653	<	fMod->ShowMembers(fInspector, parent);
653	>	fMod->ShowMembers(fInspector);
654
655		if (setAddresses) {
656		// loop through output objects and set the corresponding members

Diff Legend

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