Index: trunk/MagicSoft/Mars/macros/dohtml.C
===================================================================
--- trunk/MagicSoft/Mars/macros/dohtml.C (revision 752)
+++ trunk/MagicSoft/Mars/macros/dohtml.C (revision 753)
@@ -8,8 +8,8 @@
// create the html document class
//
- THtml html;
+ MHtml html;
html.SetOutputDir("htmldoc");
- html.SetSourceDir(".:mbase:mraw:mgui:manalysis:mdatacheck:meventdisp:mmc");
+ html.SetSourceDir(".:mbase:mraw:mgui:manalysis:mdatacheck:mmain:meventdisp:mmc:mmontecarlo:mhist");
html.SetXwho("http://hegra1.mppmu.mpg.de/MAGICWeb/collaborators.html?");
@@ -17,6 +17,11 @@
html.SetSourceDir("macros");
- html.Convert("merpp.C", "MARS - Merging and Preprocessing");
- html.Convert("readraw.C", "MARS - How To Read A Raw");
- html.Convert("rootlogon.C", "MARS - rootlogon.C");
+ html.Convert("merpp.C", "MARS - Merging and Preprocessing");
+ html.Convert("readraw.C", "MARS - How To Read A Raw");
+ html.Convert("rootlogon.C", "MARS - rootlogon.C");
+ html.Convert("readCT1.C", "MARS - Read and display CT1 Events");
+ html.Convert("readMagic.C", "MARS - Read and display Magic Events");
+ html.Convert("CT1Hillas.C", "MARS - Calculate CT1 Hillas");
+ html.Convert("MagicHillas.C", "MARS - Calculate Magic Hillas");
+ html.Convert("getCollArea.C", "MARS - Calculate Collection Area from a MC root file");
}
Index: trunk/MagicSoft/Mars/macros/getCollArea.C
===================================================================
--- trunk/MagicSoft/Mars/macros/getCollArea.C (revision 752)
+++ trunk/MagicSoft/Mars/macros/getCollArea.C (revision 753)
@@ -1,37 +1,53 @@
void getCollArea(char *filename = "/big0/Maggi/CamData/Gamma/gamma_15_on.root" )
{
-
- MParList *parlist = new MParList() ;
- MTaskList *tasklist = new MTaskList() ;
-
- MMcEvt *mcEvt = new MMcEvt() ;
- parlist->AddToList( mcEvt ) ;
+ // FIXME: Harald, you should tell the people what the result of
+ // this macro really is.
- MMcTrig *McTrig = new MMcTrig() ;
- parlist->AddToList( McTrig ) ;
+ //
+ // first we have to create our empty lists
+ //
+ MParList parlist;
+ MTaskList tasklist;
- MCollArea *collArea = new MCollArea() ;
- parlist->AddToList( collArea ) ;
+ //
+ // Setup the parameter list.
+ // - we need to create MCollArea only. The other containers
+ // are created automatically without loss - we don't have to
+ // access them-
+ // - MCollArea must be created by us because we need the pointer
+ // to it and if it would get created automatically it would also be
+ // deleted automatically
+ //
+ parlist.AddToList(&tasklist);
+ MCollArea *collArea = new MCollArea();
+ parlist.AddToList(collArea);
- MReadTree reader( "Events", filename) ;
- tasklist->AddToList( &reader ) ;
+ //
+ // Setup out tasks:
+ // - First we have to read the events
+ // - Then we can fill the efficiency histograms
+ //
+ MReadTree reader("Events", filename);
+ tasklist.AddToList(&reader);
- MCollAreaTrigger effi ;
- tasklist->AddToList( &effi) ;
-
- parlist.AddToList( tasklist);
+ MCollAreaTrigger effi;
+ tasklist.AddToList(&effi);
- tasklist->Print() ;
+ //
+ // set up the loop for the processing
+ //
+ MEvtLoop magic;
+ magic.SetParList(&parlist);
- // set up the loop for the processing
-
- MEvtLoop magic;
- magic.SetParList( parlist );
+ //
+ // Start to loop over all events
+ //
+ magic.Eventloop();
-
- magic.Eventloop() ;
-
- collArea->Draw() ;
-
+ //
+ // Now the histogram we wanted to get out of the data is
+ // filled and can be displayd
+ //
+ collArea->Draw();
}
Index: trunk/MagicSoft/Mars/macros/readCT1.C
===================================================================
--- trunk/MagicSoft/Mars/macros/readCT1.C (revision 752)
+++ trunk/MagicSoft/Mars/macros/readCT1.C (revision 753)
@@ -34,5 +34,5 @@
while (read.Process())
{
- cout << "Event: " << icount++ << endl ;
+ cout << "Event: " << icount++ << endl;
display.DrawPhotNum(&phevt);
Index: trunk/MagicSoft/Mars/mbase/MHtml.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MHtml.cc (revision 752)
+++ trunk/MagicSoft/Mars/mbase/MHtml.cc (revision 753)
@@ -1,3 +1,3 @@
-// @(#)root/html:$Name: not supported by cvs2svn $:$Id: MHtml.cc,v 1.1 2001-04-18 13:34:23 tbretz Exp $
+// @(#)root/html:$Name: not supported by cvs2svn $:$Id: MHtml.cc,v 1.2 2001-04-18 15:26:04 tbretz Exp $
// Author: Nenad Buncic 18/10/95
@@ -722,4 +722,5 @@
Bool_t postponeMemberDescr = kFALSE;
Bool_t skipMemberName = kFALSE;
+ Bool_t writeBracket = kFALSE;
streampos postponedpos = 0;
@@ -824,5 +825,5 @@
- if( extractComments ) {
+ if( extractComments) {
if( firstCommentLine ) {
out << "";
@@ -948,7 +949,9 @@
if( method ) {
+
if (skipMemberName)
{
skipMemberName = kFALSE;
+ writeBracket = kTRUE;
sourceFile.seekg(postponedpos);
}
@@ -1057,11 +1060,12 @@
ExpandKeywords( out, nameEndPtr, classPtr, flag );
out << "
" << endl;
+
if (postponeMemberDescr)
{
- postponeMemberDescr = kFALSE;
streampos pos = sourceFile.tellg();
sourceFile.seekg(postponedpos);
postponedpos = pos;
skipMemberName = kTRUE;
+ postponeMemberDescr = kFALSE;
}
extractComments = kTRUE;
@@ -1075,12 +1079,22 @@
// write to '.cxx.html' file
- if( thisLineIsPpLine )
- ExpandPpLine( tempFile, fLine );
- else {
- if( thisLineIsCommented ) tempFile << "";
- ExpandKeywords( tempFile, fLine, classPtr, tempFlag, "../" );
- if( thisLineIsCommented ) tempFile << "";
+ if (!skipMemberName)
+ {
+ if( thisLineIsPpLine )
+ ExpandPpLine( tempFile, fLine );
+ else {
+ if( thisLineIsCommented) tempFile << "";
+ ExpandKeywords( tempFile, fLine, classPtr, tempFlag, "../" );
+ if( thisLineIsCommented ) tempFile << "";
+ }
+ tempFile << endl;
+
+ if (writeBracket)
+ {
+ writeBracket = kFALSE;
+ tempFile << "{" << endl;
+ }
}
- tempFile << endl;
+
}
tempFile << "" << endl;
Index: trunk/MagicSoft/Mars/mgui/MGeomCamCT1.h
===================================================================
--- trunk/MagicSoft/Mars/mgui/MGeomCamCT1.h (revision 752)
+++ trunk/MagicSoft/Mars/mgui/MGeomCamCT1.h (revision 753)
@@ -22,5 +22,5 @@
void Draw(Option_t *option = "" ) ;
- ClassDef(MGeomCamCT1, 1) // Geometry class for the camera
+ ClassDef(MGeomCamCT1, 1) // Geometry class for the CT1 camera
};