Changeset 5827


Ignore:
Timestamp:
01/13/05 19:28:53 (20 years ago)
Author:
rico
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mtemp/mifae/programs
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

    r5826 r5827  
    6161#include "MContinue.h"
    6262#include "MReportDrive.h"
     63#include "MTopology.h"
     64#include "MTopologyCalc.h"
    6365
    6466#include "TApplication.h"
     
    9395Float_t  ltail     = 1.5;
    9496Int_t    islflag   = 0;
     97Int_t    topflag   = 0;
    9598Float_t  lnew      = 40;
    9699Int_t    kmethod   = 1;
     
    207210          pedloop2.SetNoStorage();
    208211          pedloop2.SetExtractor(extractor);
    209           pedloop2.SetExtractorResolution();
    210212          pedloop2.SetPedestals(pedloop1.GetPedestalCam()); 
    211213          pedloop2.SetInput(&pedcaliter);
     
    374376  MIslands      isl2;
    375377  MIslands      isl3;
     378  MTopology     topology;
    376379 
    377380  isl.SetName("MIslands"); 
     
    401404  plist5.AddToList(&runhead);
    402405  plist5.AddToList(&reportdrive);
     406  plist5.AddToList(&topology);
    403407 
    404408  // cuts
     
    435439  MHillasCalc       hcalc;
    436440  MHillasSrcCalc    csrc1;
     441
     442  MTopologyCalc     topcalc;
    437443 
    438444  MContinue applycut(&cut);
     
    453459  write.AddContainer("MIslands"       , "Parameters");
    454460  write.AddContainer("MReportDrive"   , "Parameters");
     461  write.AddContainer("MTopology",       "Parameters");
    455462 
    456463  if (islflag == 2)
     
    494501  if(filter.Length())
    495502    tlist5.AddToList(&applycut);
     503  if(topflag>0)
     504    tlist5.AddToList(&topcalc);
    496505  tlist5.AddToList(&write);
    497506  if(display)
     
    503512      tlist5.AddToList(disphillas);
    504513    }
     514
    505515 
    506516  // Create and setup the eventloop
     
    635645        ifun >> sext >> hifirst >> hilast >> lofirst >> lolast >> wsize;
    636646     
     647      if(strcmp(word.Data(),"TOPFLAG")==0)
     648        ifun >> topflag;
     649
    637650      if(strcmp(word.Data(),"ISLFLAG")==0)
    638651        {
     
    674687  cout << "Maximum number of events: " << nmaxevents << endl;
    675688  if(filter.Length())
    676     cout << "Applying rejection cut: " << filter << endl;
     689    cout << "Applying selection cut: " << filter << endl;
    677690  cout << "Output file name: " << outname << endl;
    678691  if(display)
     
    692705  if (islflag == 1 || islflag == 2)
    693706    cout << "Island calcultation..." << "using algorithm #" << kalgorithm <<endl;
     707  if (topflag > 0)
     708    cout << "Topology parameters will be computed" << endl;
    694709  if (islflag == 2)
    695710    {
  • trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard

    r5775 r5827  
    1111
    1212// Maximun number of (data) events to be processed)
    13 NEVENTS 5000
     13NEVENTS 999999
    1414
    1515// data file directory
     
    3030// Enclose all conditions between brakets, like: "(x<y) && (z<5)"
    3131// (see MF description class for more details)
    32 // FILTER (MHillas.fLength<100) && (MHillas.fLength>50)
     32FILTER (MNewImagePar.fNumUsedPixels<400)
    3333
    3434// Display flag
     
    6161
    6262// Cleaning level (tail cut, boundary cut, number of rings, cleaning method - 1=standard, 2=democratic)
    63 CLEANLEVEL 2.5 2.0 1 1
     63CLEANLEVEL 4.0 3.5 1 1
    6464
    6565//Island calculations
     
    7474ISLANDCLEAN 1 40
    7575
     76// topology flag
     77// 0: do not calculate topology parameters
     78// 1: calculate topology parameters
     79TOPFLAG 1
     80
Note: See TracChangeset for help on using the changeset viewer.