Changeset 584 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
01/19/01 14:20:51 (24 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r574 r584  
    1                                                                -*-*- END -*-*-
     1                                                                  -*-*- END -*-*-
     2
     3 2000/01/19: Thomas Bretz
     4
     5    * mmc/*.hxx:
     6       - changed include of MDefineTrigger.h back
     7
     8
     9 2000/01/19: Oscar Blanch
     10
     11    * mmc/MTriggerDefine.h:
     12       - added
     13
     14
    215 2000/01/18: Thomas Bretz
    3  
    4  * Makefile:
    5     - mmc-library added
    6  
    7  * Makefile.conf.general:
    8     - Added definition of __MARS__
    9    
    10  * Makefile.rules:
    11     - Added definitions to rootcint
    12  
    13  * Oscar added the McFormat subdir of the Monte Carlo as mmc
    14  
    15  * mmc/MMcEvt.h:
    16     - renamed to MMcEvt.hxx
    17  
    18  * mmc/*.hxx:
    19     - added necessary defintions from MDefineTrigger.h
    20  
    21  * mmc/Makefile, mmc/McLinkDef.h, mmc/McIncl.h, mmc/readme.txt:
    22     - added
    23    
    24  * mmc/LinkDef.h:
    25     - removed
    26    
     16
     17    * Makefile:
     18       - mmc-library added
     19
     20    * Makefile.conf.general:
     21       - Added definition of __MARS__
     22
     23    * Makefile.rules:
     24       - Added definitions to rootcint
     25
     26    * Oscar added the McFormat subdir of the Monte Carlo as mmc
     27
     28    * mmc/MMcEvt.h:
     29       - renamed to MMcEvt.hxx
     30
     31    * mmc/*.hxx:
     32       - added necessary defintions from MDefineTrigger.h
     33
     34    * mmc/Makefile, mmc/McLinkDef.h, mmc/McIncl.h, mmc/readme.txt:
     35       - added
     36
     37    * mmc/LinkDef.h:
     38       - removed
     39
    2740
    2841 2000/01/17: Thomas Bretz
    29  
    30  * Makefile:
    31     - Exchanged explicit rules to make library by implicit ones
    32     - The shared object works now. I exchanged the libraries with the object files.
    33       But I don't know why the libraries don't work.
    34      
    35  * Makefile.conf.linux-gnu:
    36     - replaced CC with gcc (instead of g++)
    37    
    38  * mdatacheck/DataCheckLinkDef.h:
    39     - removed unused statements
    40    
    41  * mraw/RawLinkDef.h:
    42     - added globals
    43    
    44  * mraw/MerppLinkDef.h:
    45     - removed unused file
    46  
    47  
     42
     43    * Makefile:
     44       - Exchanged explicit rules to make library by implicit ones
     45       - The shared object works now. I exchanged the libraries with the object
     46         files. But I don't know why the libraries don't work.
     47
     48    * Makefile.conf.linux-gnu:
     49       - replaced CC with gcc (instead of g++)
     50
     51    * mdatacheck/DataCheckLinkDef.h:
     52       - removed unused statements
     53
     54    * mraw/RawLinkDef.h:
     55       - added globals
     56
     57    * mraw/MerppLinkDef.h:
     58       - removed unused file
     59
     60
    4861 2000/01/12: Thomas Bretz
    49  
    50  * MLinkDef.h, MIncl.h, marslogo.xpm, magiclogo.xpm:
    51     - added
    52    
    53  * LinkDef.h:
    54     - removed
    55    
    56  * Makefile:
    57     - Added CINT, mrproper
    58  
    59  * mbase/Makefile, mraw/Makefile, mgui/Makefile, mdatacheck/Makefile:
    60     - included makefile.general, Makefile.rules,
    61     - removes corresponding lines
    62  
    63  * mdatacheck/MDumpEvtHeader.[h,cc], mdatacheck/MFillAdcSpect.[cc,h],
    64    mdatacheck/MFillAdcSpect.[h,cc], mdatacheck/MGDisplayAdc.[cc,h],
    65    mdatacheck/MHistsosAdc.[h,cc], mdatacheck.MShowSpect.[cc,h]
    66     - changed include statements
    67  
    68  * mgui/MGDataCheckMain.[cc,h], mgui/MGMarsMain.[cc,h]
    69     - changed include statements
    70     - move enum from h to cc
    71     - removed comma operator from delete statements (nonsense)
     62
     63    * MLinkDef.h, MIncl.h, marslogo.xpm, magiclogo.xpm:
     64       - added
     65
     66    * LinkDef.h:
     67       - removed
     68
     69    * Makefile:
     70       - Added CINT, mrproper
     71
     72    * mbase/Makefile, mraw/Makefile, mgui/Makefile, mdatacheck/Makefile:
     73       - included makefile.general, Makefile.rules,
     74       - removes corresponding lines
     75
     76    * mdatacheck/MDumpEvtHeader.[h,cc], mdatacheck/MFillAdcSpect.[cc,h],
     77      mdatacheck/MFillAdcSpect.[h,cc], mdatacheck/MGDisplayAdc.[cc,h],
     78      mdatacheck/MHistsosAdc.[h,cc], mdatacheck.MShowSpect.[cc,h]
     79       - changed include statements
     80
     81    * mgui/MGDataCheckMain.[cc,h], mgui/MGMarsMain.[cc,h]
     82       - changed include statements
     83       - move enum from h to cc
     84       - removed comma operator from delete statements (nonsense)
    7285
    7386
    7487 2001/01/11: Harald Kornmayer
    7588
    76  * ./
    77    readraw.cc, Makefile, Makefile.rules, LinkDef.h, MParList.cc, MReadTree.cc,
    78    MReadTree.h, mbase/Makefile, mraw/Makefile     
    79     - small changes in this files. Not really critical.
     89    * ./
     90      readraw.cc, Makefile, Makefile.rules, LinkDef.h, MParList.cc, MReadTree.cc,
     91      MReadTree.h, mbase/Makefile, mraw/Makefile
     92       - small changes in this files. Not really critical.
    8093
    81  * mars.cc
    82     - added the main file for the gui
     94    * mars.cc
     95       - added the main file for the gui
    8396
    84  * mgui/
    85    GuiIncl.h, MGMarsMain.cc, GuiLinkDef.h, MGMarsMain.h, MGDataCheckMain.cc,
    86    Makefile, MGDataCheckMain.h
    87     - added the subdir mgui and this files
     97    * mgui/
     98      GuiIncl.h, MGMarsMain.cc, GuiLinkDef.h, MGMarsMain.h, MGDataCheckMain.cc,
     99      Makefile, MGDataCheckMain.h
     100       - added the subdir mgui and this files
    88101
    89  * mdatacheck/
    90    DataCheckIncl.h, DataCheckLinkDef.h, MHistosAdc.cc, MHistosAdc.h,
    91    MDumpEvtHeader.cc, MDumpEvtHeader.h, MShowSpect.cc, MShowSpect.h,
    92    MFillAdcSpect.cc, MFillAdcSpect.h, MViewAdcSpectra.cc, MViewAdcSpectra.h,
    93    MGDisplayAdc.cc, MGDisplayAdc.h, Makefile
    94     - added the subdir mdatacheck and this files
     102    * mdatacheck/
     103      DataCheckIncl.h, DataCheckLinkDef.h, MHistosAdc.cc, MHistosAdc.h,
     104      MDumpEvtHeader.cc, MDumpEvtHeader.h, MShowSpect.cc, MShowSpect.h,
     105      MFillAdcSpect.cc, MFillAdcSpect.h, MViewAdcSpectra.cc, MViewAdcSpectra.h,
     106      MGDisplayAdc.cc, MGDisplayAdc.h, Makefile
     107       - added the subdir mdatacheck and this files
    95108
    96        
     109
    97110 2000/12/28: Thomas Bretz
    98  
    99  * merpp.cc, MArray.cc, MArray.h, MArrayB.cc, MArrayB.h, MArrayS.cc,
    100    MArrayS.h, MEvtLoop.cc, MEvtLoop.h, MInputStreamID.cc, MInputStreamID.h,
    101    MParContainer.cc, MParContainer.h, MParList.cc, MParList.h, MReadTree.cc,
    102    MTask.cc, MTask.h, MTaskList.cc, MTaskList.h, MTime.cc, MTime.h:
    103     - Added changes some comments.
    104    
    105  * MLoopEvt.cc, MLoopEvt.h:
    106     - Removed
     111
     112    * merpp.cc, MArray.cc, MArray.h, MArrayB.cc, MArrayB.h, MArrayS.cc,
     113      MArrayS.h, MEvtLoop.cc, MEvtLoop.h, MInputStreamID.cc, MInputStreamID.h,
     114      MParContainer.cc, MParContainer.h, MParList.cc, MParList.h, MReadTree.cc,
     115      MTask.cc, MTask.h, MTaskList.cc, MTaskList.h, MTime.cc, MTime.h:
     116       - Added changes some comments.
     117
     118    * MLoopEvt.cc, MLoopEvt.h:
     119       - Removed
    107120
    108121
    109122 2000/12/22 - Thomas Bretz:
    110  
    111  * readraw.cc:
    112     - changed some comments and the Root-Name of the program
    113     - added check for the existance of the file
    114     - changed name of numbers of entries from iEnt to nent
    115123
    116  * dohtml.C:
    117     - changed title of converted macros
    118    
    119  * MRawEvtData.cc:
    120     - added a commet in Draw()
    121    
    122  * MRawEvtPixelIter.[h,cc]:
    123     - Added the comment header of the file
    124     - removed inheritance from TIterator (not needed)
    125     - some changes to get it work (the one in the repository was untested
    126       and not working)
    127     - changed calling style of iterator from do...while to while-loop
    128     - changed some comments
    129    
    130  * MRawRunHeader.cc:
    131     - added some comments
     124    * readraw.cc:
     125       - changed some comments and the Root-Name of the program
     126       - added check for the existance of the file
     127       - changed name of numbers of entries from iEnt to nent
    132128
    133  * Changelog, News: added
    134  
    135  * test.C: removed
     129    * dohtml.C:
     130       - changed title of converted macros
     131
     132    * MRawEvtData.cc:
     133       - added a commet in Draw()
     134
     135    * MRawEvtPixelIter.[h,cc]:
     136       - Added the comment header of the file
     137       - removed inheritance from TIterator (not needed)
     138       - some changes to get it work (the one in the repository was untested
     139         and not working)
     140       - changed calling style of iterator from do...while to while-loop
     141       - changed some comments
     142
     143    * MRawRunHeader.cc:
     144       - added some comments
     145
     146    * Changelog, News: added
     147
     148    * test.C: removed

  • trunk/MagicSoft/Mars/readraw.cc

    r583 r584  
    1818#include "MInputStreamID.h"
    1919
    20 #include "MMcEvt.h"
     20#include "MMcEvt.hxx"
    2121
    2222#include "MGMarsMain.h"
    … …  
    7272    //  open the file
    7373    //
    74 
    7574    cout << " Open the file " << endl ;
    76 
    7775    TFile input(argv[1], "READ");
    7876
    … …  
    8078    // open the Run Header and read in
    8179    //
    82 
    8380    cout << " Check the RunHeader " << endl ;
    8481    TTree *runtree = (TTree*) input.Get("RunHeaders") ;
    8582   
    8683    if (!runtree)
    87       {
    88         cout << endl
    89              << "  WARNING: This file has NO RunHeader "
    90              << endl << endl ;
    91       }
     84    {
     85        cout << endl
     86            << "  WARNING: This file has NO RunHeader "
     87            << endl << endl ;
     88    }
    9289    else
    93       { 
    94         cout << " Entries in Tree RunHeaders: " << dec << runtree->GetEntries() << endl ;
    95        
    96         runtree->GetBranch("MRawRunHeader")->SetAddress(&runheader);
    97         runtree->GetEvent(0);
    98        
    99         runheader->Print();
    100       }
     90    {
     91        cout << " Entries in Tree RunHeaders: " << dec << runtree->GetEntries() << endl ;
     92
     93        runtree->GetBranch("MRawRunHeader")->SetAddress(&runheader);
     94        runtree->GetEvent(0);
     95
     96        runheader->Print();
     97    }
    10198
    10299    //
    103100    // open the DataTree and read in
    104101    //
    105 
    106102    cout << " Check the Event Tree " << endl ;
    107    
    108103    TTree *evttree = (TTree*) input.Get("Events") ;
    109 
    110104    cout << " Check all the Branches in the Tree " << endl ;
    111105   
    112    
     106    //
    113107    //  check the branches in the Tree
    114    
     108    //
    115109    TIter Next(evttree->GetListOfBranches());
    116110    TBranch *branch=NULL;
    117111   
    118     while ( (branch=(TBranch*)Next()) )
     112    while ((branch=(TBranch*)Next()))
    119113    {
    120114        //
    … …  
    123117        const char *name = branch->GetName();
    124118       
    125         //      cout << name << endl ;
     119        if (!strcmp(name, "MRawEvtHeader"))
     120            evttree->GetBranch("MRawEvtHeader")->SetAddress(&evtheader);
    126121
    127         if ( ! strcmp(name, "MRawEvtHeader") )
    128           evttree->GetBranch("MRawEvtHeader")->SetAddress(&evtheader);
     122        if (!strcmp(name, "MTime"))
     123            evttree->GetBranch("MTime")->SetAddress(&evttime);
    129124
    130         if ( ! strcmp(name, "MTime") )
    131           evttree->GetBranch("MTime")->SetAddress(&evttime);
     125        if (!strcmp(name, "MRawEvtData"))
     126            evttree->GetBranch("MRawEvtData")->SetAddress(&evtdata);
    132127
    133         if ( ! strcmp(name, "MRawEvtData") )
    134           evttree->GetBranch("MRawEvtData")->SetAddress(&evtdata);
     128        if (!strcmp(name, "MRawCrateArray"))
     129            evttree->GetBranch("MRawCrateArray")->SetAddress(&evtcrate);
    135130
    136         if ( ! strcmp(name, "MRawCrateArray") )
    137           evttree->GetBranch("MRawCrateArray")->SetAddress(&evtcrate);
     131        if (!strcmp(name, "MMcEvt"))
     132            evttree->GetBranch("MMcEvt")->SetAddress(&evtmc);
    138133
    139         if ( ! strcmp(name, "MMcEvt") )
    140           evttree->GetBranch("MMcEvt")->SetAddress(&evtmc);
     134        if (!strcmp(name, "MMcTrig"))
     135            cout << " Not able to connect to class MMcTrig yet." << endl;
     136    }
    141137
    142         if ( ! strcmp(name, "MMcTrig") )
    143           cout << " Not able to connect to class MMcTrig yet " << endl ;
     138    //
     139    // loop over all entries
     140    //
     141    Int_t nent = (Int_t)evttree->GetEntries();
    144142
    145 
    146     }
    147    
    148     // loop over all entries
    149    
    150     Int_t nent = (Int_t)evttree->GetEntries();
    151    
    152     cout << endl << endl 
    153          << " Entries in Tree Data: " << dec << nent << endl;
     143    cout << endl << endl;
     144    cout << " Entries in Tree Data: " << dec << nent << endl;
    154145
    155146    for (Int_t i = 0; i<nent; i++)
    … …  
    157148        cout << "Entry: " << i << endl;
    158149
     150        //
    159151        // readin event with the selected branches
     152        //
    160153        evttree->GetEvent(i);
    161154
    … …  
    166159        evtcrate->Print();
    167160        evtdata->Print();
    168 
    169161    }
    170162   
Note: See TracChangeset for help on using the changeset viewer.