Ignore:
Timestamp:
06/13/03 16:42:37 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mfilter
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mfilter/MF.cc

    r2123 r2173  
    8383#include <ctype.h>        // isalnum, ...
    8484#include <stdlib.h>       // strtod, ...
    85 #include <fstream.h>      // ofstream, ...
     85#include <fstream>      // ofstream, ...
    8686
    8787#include <TMethodCall.h>
    … …  
    9797
    9898ClassImp(MF);
     99
     100using namespace std;
    99101
    100102const TString MF::gsDefName  = "MF";

  • trunk/MagicSoft/Mars/mfilter/MFAlpha.cc

    r1483 r2173  
    3131
    3232#include <math.h>
    33 #include <fstream.h>
     33#include <fstream>
    3434
    3535#include "MLog.h"
    … …  
    4242ClassImp(MFAlpha);
    4343
     44using namespace std;
    4445
    4546// --------------------------------------------------------------------------
    … …  
    6263// --------------------------------------------------------------------------
    6364//
    64 void MFAlpha::Init(const char type, const Int_t val,
     65void MFAlpha::Init(const char type, const Float_t val,
    6566                   const char *name, const char *title)
    6667{

  • trunk/MagicSoft/Mars/mfilter/MFAlpha.h

    r1481 r2173  
    2727    Float_t fValue; // [deg]
    2828
    29     void Init(const char type, const Int_t val,
     29    void Init(const char type, const Float_t val,
    3030              const char *name, const char *title);
    3131

  • trunk/MagicSoft/Mars/mfilter/MFCT1SelBasic.cc

    r2037 r2173  
    5757ClassImp(MFCT1SelBasic);
    5858
     59using namespace std;
     60
    5961// --------------------------------------------------------------------------
    6062//

  • trunk/MagicSoft/Mars/mfilter/MFCT1SelFinal.cc

    r2076 r2173  
    5757
    5858ClassImp(MFCT1SelFinal);
     59
     60using namespace std;
    5961
    6062// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfilter/MFCT1SelStandard.cc

    r2059 r2173  
    5858ClassImp(MFCT1SelStandard);
    5959
     60using namespace std;
     61
    6062// --------------------------------------------------------------------------
    6163//

  • trunk/MagicSoft/Mars/mfilter/MFDataChain.cc

    r2098 r2173  
    4444#include "MFDataChain.h"
    4545
    46 #include <fstream.h>
     46#include <fstream>
    4747
    4848#include <TMethodCall.h>
    … …  
    5454
    5555ClassImp(MFDataChain);
     56
     57using namespace std;
    5658
    5759// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfilter/MFDataMember.cc

    r1661 r2173  
    4444#include "MFDataMember.h"
    4545
    46 #include <fstream.h>
     46#include <fstream>
    4747
    4848#include <TMethodCall.h>
    … …  
    5454
    5555ClassImp(MFDataMember);
     56
     57using namespace std;
    5658
    5759// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfilter/MFEnergySlope.cc

    r2010 r2173  
    4848#include "MFEnergySlope.h"
    4949
    50 #include <fstream.h>
     50#include <fstream>
    5151#include <TRandom.h>
    5252
    … …  
    6060
    6161ClassImp(MFEnergySlope);
     62
     63using namespace std;
    6264
    6365// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfilter/MFEventSelector.cc

    r2118 r2173  
    7474ClassImp(MFEventSelector);
    7575
     76using namespace std;
     77
    7678static const TString gsDefName  = "MFEventSelector";
    7779static const TString gsDefTitle = "Filter to select events";

  • trunk/MagicSoft/Mars/mfilter/MFEventSelector2.cc

    r2118 r2173  
    112112
    113113ClassImp(MFEventSelector2);
     114
     115using namespace std;
    114116
    115117const TString MFEventSelector2::gsDefName  = "MFEventSelector2";
    … …  
    133135//     would result in redistributing cos(Theta).
    134136//
    135 MFEventSelector2::MFEventSelector2(MH3 &hist, const char *name=NULL, const char *title=NULL)
     137MFEventSelector2::MFEventSelector2(MH3 &hist, const char *name, const char *title)
    136138: fHistOrig(NULL), fHistNom(&hist), fHistRes(NULL),
    137139  fDataX(hist.GetRule('x')), fDataY(hist.GetRule('y')),
    … …  
    178180// Reading task of the present loop is used in a new eventloop.
    179181//
    180 Bool_t MFEventSelector2::Read(MRead &read)
     182Bool_t MFEventSelector2::ReadDistribution(MRead &read)
    181183{
    182184    if (read.GetEntries() > INT_MAX) // FIXME: LONG_MAX ???
    … …  
    355357
    356358    // Read primary distribution
    357     if (!Read(*read))
     359    if (!ReadDistribution(*read))
    358360        return kFALSE;
    359361

  • trunk/MagicSoft/Mars/mfilter/MFEventSelector2.h

    r2118 r2173  
    4444
    4545    TH1   &InitHistogram(MH3* &hist);
    46     Bool_t Read(MRead &read);
     46    Bool_t ReadDistribution(MRead &read);
    4747    void   PrepareHistograms();
    4848    Bool_t PreProcessData(MParList *parlist);

  • trunk/MagicSoft/Mars/mfilter/MFParticleId.cc

    r1483 r2173  
    3434#include "MFParticleId.h"
    3535
    36 #include <fstream.h>
     36#include <fstream>
    3737
    3838#include "MLog.h"
    … …  
    4545ClassImp(MFParticleId);
    4646
     47using namespace std;
    4748
    4849// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.cc

    r1483 r2173  
    3030#include "MFTriggerLvl1.h"
    3131
    32 #include <fstream.h>
     32#include <fstream>
    3333
    3434#include "MLog.h"
    … …  
    4141ClassImp(MFTriggerLvl1);
    4242
     43using namespace std;
    4344
    4445// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfilter/MFTriggerLvl2.cc

    r1777 r2173  
    2020!   Copyright: MAGIC Software Development, 2000-2003
    2121!
    22 !   Filter for L2Trigger. 02/2003
    23 !
    2422\* ======================================================================== */
    2523
    … …  
    3331#include "MFTriggerLvl2.h"
    3432
    35 #include <fstream.h>
     33#include <fstream>
    3634
    3735#include "MLog.h"
    … …  
    4442ClassImp(MFTriggerLvl2);
    4543
     44using namespace std;
    4645
    4746// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfilter/MFilterList.cc

    r1936 r2173  
    3030#include "MFilterList.h"
    3131
    32 #include <fstream.h>
     32#include <fstream>
    3333
    3434#include <TString.h>
    … …  
    4040
    4141ClassImp(MFilterList);
     42
     43using namespace std;
    4244
    4345static const TString gsDefName  = "MFilterList";

  • trunk/MagicSoft/Mars/mfilter/MFilterList.h

    r1486 r2173  
    5050
    5151    void Print(Option_t *opt = "") const;
    52     TString GetRule(Option_t *opt="") const;
     52    TString GetRule() const { return GetRule(""); }
     53    TString GetRule(Option_t *opt) const;
    5354
    5455    ClassDef(MFilterList, 1)            // List to combine several filters logically
Note: See TracChangeset for help on using the changeset viewer.