Changeset 9 for trunk

Timestamp:

Jul 8, 2008, 2:01:52 PM (16 years ago)

Author:

Pavel Demin

Message:

remove ExRootMainNew, add ExRootLHCOlympicsWriter

Location:

trunk

Files:

• Makefile (modified) (8 diffs)
• src/ExRootAnalysisLinkDef.h (modified) (3 diffs)

trunk/Makefile

@@ -92 +92 @@
         test/ExRootMain.cpp \
         ExRootAnalysis/ExRootAnalysis.h
-ExRootMainNew$(ExeSuf): \
-        tmp/test/ExRootMainNew.$(ObjSuf)
-
-tmp/test/ExRootMainNew.$(ObjSuf): \
-        test/ExRootMainNew.cpp \
-        ExRootAnalysis/ExRootAnalysisNew.h
 Example$(ExeSuf): \
         tmp/test/Example.$(ObjSuf)
@@ -117 +111 @@
         ExRootAnalysis/ExRootTreeWriter.h \
         ExRootAnalysis/ExRootTreeBranch.h \
+        ExRootAnalysis/ExRootUtilities.h \
+        ExRootAnalysis/ExRootProgressBar.h
+ExRootLHCOlympicsWriter$(ExeSuf): \
+        tmp/test/ExRootLHCOlympicsWriter.$(ObjSuf)
+
+tmp/test/ExRootLHCOlympicsWriter.$(ObjSuf): \
+        test/ExRootLHCOlympicsWriter.cpp \
+        ExRootAnalysis/ExRootClasses.h \
+        ExRootAnalysis/ExRootTreeReader.h \
         ExRootAnalysis/ExRootUtilities.h \
         ExRootAnalysis/ExRootProgressBar.h
@@ -124 +127 @@
         ExRootLHEFConverter$(ExeSuf) \
         ExRootMain$(ExeSuf) \
-        ExRootMainNew$(ExeSuf) \
         Example$(ExeSuf) \
-        MatchingTreeConverter$(ExeSuf)
+        MatchingTreeConverter$(ExeSuf) \
+        ExRootLHCOlympicsWriter$(ExeSuf)
 
 EXECUTABLE_OBJ =  \
@@ -133 +136 @@
         tmp/test/ExRootLHEFConverter.$(ObjSuf) \
         tmp/test/ExRootMain.$(ObjSuf) \
-        tmp/test/ExRootMainNew.$(ObjSuf) \
         tmp/test/Example.$(ObjSuf) \
-        tmp/test/MatchingTreeConverter.$(ObjSuf)
+        tmp/test/MatchingTreeConverter.$(ObjSuf) \
+        tmp/test/ExRootLHCOlympicsWriter.$(ObjSuf)
 
 tmp/src/ExRootAnalysisDict.$(SrcSuf): \
@@ -153 +156 @@
         ExRootAnalysis/ExRootConfReader.h \
         ExRootAnalysis/ExRootEventLoop.h \
-        ExRootAnalysis/ExRootAnalysisNew.h \
         ExRootAnalysis/ExRootAnalysis.h \
         ExRootAnalysis/ExRootFactory.h \
@@ -197 +199 @@
         src/ExRootAnalysis.$(SrcSuf) \
         ExRootAnalysis/ExRootAnalysis.h \
-        ExRootAnalysis/ExRootFactory.h \
-        ExRootAnalysis/ExRootConfReader.h \
-        ExRootAnalysis/ExRootTreeReader.h \
-        ExRootAnalysis/ExRootTreeWriter.h \
-        ExRootAnalysis/ExRootUtilities.h \
-        ExRootAnalysis/ExRootProgressBar.h
-tmp/src/ExRootAnalysisNew.$(ObjSuf): \
-        src/ExRootAnalysisNew.$(SrcSuf) \
-        ExRootAnalysis/ExRootAnalysisNew.h \
         ExRootAnalysis/ExRootFactory.h \
         ExRootAnalysis/ExRootConfReader.h \
@@ -641 +634 @@
 SOURCE_OBJ =  \
         tmp/src/ExRootAnalysis.$(ObjSuf) \
-        tmp/src/ExRootAnalysisNew.$(ObjSuf) \
         tmp/src/ExRootCandList.$(ObjSuf) \
         tmp/src/ExRootCandidate.$(ObjSuf) \
@@ -869 +861 @@
         tmp/tcl/tclVar.$(ObjSuf)
 
-ExRootAnalysis/ExRootAnalysisNew.h: \
-        ExRootAnalysis/ExRootTask.h
-        @touch $@
-
 CLHEP/Vector/RotationZ.h: \
         CLHEP/Vector/defs.h \

trunk/src/ExRootAnalysisLinkDef.h

@@ -4 +4 @@
  *  Lists classes to be included in cint dicitonary
  *
- *  $Date: 2008-06-04 13:57:53 $
- *  $Revision: 1.1 $
+ *  $Date: 2008-07-08 12:01:52 $
+ *  $Revision: 1.2 $
  *
  *  
@@ -27 +27 @@
 #include "ExRootAnalysis/ExRootConfReader.h"
 #include "ExRootAnalysis/ExRootEventLoop.h"
-#include "ExRootAnalysis/ExRootAnalysisNew.h"
 #include "ExRootAnalysis/ExRootAnalysis.h"
 #include "ExRootAnalysis/ExRootFactory.h"
@@ -67 +66 @@
 #pragma link C++ class ExRootConfReader+;
 #pragma link C++ class ExRootEventLoop+;
-#pragma link C++ class ExRootAnalysisNew+;
 #pragma link C++ class ExRootAnalysis+;
 #pragma link C++ class ExRootFactory+;