Ignore:
Timestamp:
01/10/05 17:51:04 (20 years ago)
Author:
rico
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mtemp/mifae/programs
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mtemp/mifae/programs/Makefile

    r5281 r5775  
    1818include ../../../Makefile.conf.general
    1919
    20 PROGRAMS = makeHillas psffit falseSource srcPos optimizeCuts  controlPlot
     20PROGRAMS = makeHillas
     21#psffit falseSource srcPos optimizeCuts  controlPlot
    2122SOLIB    = $(MARSSYS)/libmars.so
    2223
  • trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

    r5657 r5775  
    66#include "TArrayS.h"
    77
     8#include "MArray.h"
     9#include "MParContainer.h"
    810#include "MParList.h"
    911#include "MTaskList.h"
     
    3436#include "MCerPhotEvt.h"
    3537#include "MPedPhotCam.h"
     38#include "MArrivalTime.h"
    3639#include "MCalibrateData.h"
    3740#include "MPedPhotCalc.h"
     
    6063
    6164#include "TApplication.h"
     65#include "TClass.h"
    6266
    6367#include <iostream>
     
    101105
    102106const TString defaultcard="makehillas.datacard";
    103 char* chext[3]={"Fixed window","Sliding window","Peak Search"};
     107char* chext[4]={"Fixed window","Sliding window","Peak Search","Spline"};
    104108/*************************************************************/
    105109static void Usage()
     
    117121  TApplication app("Application",0,0);
    118122
     123  // to deal correctly with the streamer
     124  MArray::Class()->IgnoreTObjectStreamer();
     125  MParContainer::Class()->IgnoreTObjectStreamer();
     126
    119127  // evaluate arguments
    120128  MArgs arg(argc, argv);
     
    158166    case 3:
    159167      extractor = new MExtractTimeAndChargeSpline();
     168      ((MExtractTimeAndChargeSpline*)extractor)->SetTimeType(MExtractTimeAndChargeSpline::kHalfMaximum);
    160169      ((MExtractTimeAndChargeSpline*)extractor)->SetChargeType(MExtractTimeAndChargeSpline::kIntegral);     
    161170      ((MExtractTimeAndChargeSpline*)extractor)->SetRiseTime((Float_t)wsize*0.25);
    162171      ((MExtractTimeAndChargeSpline*)extractor)->SetFallTime((Float_t)wsize*0.75);
    163       ((MExtractTimeAndChargeSpline*)extractor)->SetTimeType(MExtractTimeAndChargeSpline::kHalfMaximum);
    164172      break;
    165173    default:
     
    210218    }
    211219
    212   MPedestalCam pedcammean = pedloop1.GetPedestalCam();     
     220  MPedestalCam& pedcammean = pedloop1.GetPedestalCam();     
    213221  extractor->SetPedestals(&pedcammean);
    214222
     
    228236    if (!calloop.Process(pedcammean))
    229237      return;
     238
     239  MCalibrationChargeCam &chargecam = calloop.GetCalibrationCam();
     240  chargecam.Print();
    230241
    231242
     
    316327      plist4.AddToList(&tlist4);
    317328      plist4.AddToList(&geomcam);
    318      
     329      plist4.AddToList(&pedcamrms);
     330
    319331      //tasks
    320332      MReadMarsFile read4("Events");
     
    351363  MCerPhotEvt     nphot;
    352364  MPedPhotCam     nphotrms;
     365  MArrivalTime    arrtime;
    353366  MHillas         hillas;
    354367  MNewImagePar    newimagepar;
     
    382395  plist5.AddToList(&nphot);
    383396  plist5.AddToList(&nphotrms);
     397  plist5.AddToList(&arrtime);
    384398  plist5.AddToList(&source);
    385399  plist5.AddToList(&hillas);
  • trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard

    r5657 r5775  
    1111
    1212// Maximun number of (data) events to be processed)
    13 NEVENTS 99999999
     13NEVENTS 5000
    1414
    1515// data file directory
    16 IDIR /mnt/magic/Data/rootdata/CrabNebula/Period021/2004_09_22/
     16IDIR /local_disk/jrico/rawdata/
    1717
    1818// Pedestal (PRUNS), calibration (CRUNS) and data runs (DRUNS), e.g 1500-23444,25444,25455-26544
    1919// if PRUNS 0, take pedestals from low gains
    20 PCRUNS 39313
    21 CRUNS  39315
    22 DRUNS 39261,39262,39264,39265,39269,39271,39273,39274,39276,39277,39279,39280,39282,39283,39285
    23 //,39286,39288,39290,39292-39294,39296-39299,39301,39302,39304-39306,39308,39309,39311,39318,39319,39321,39322,39324,39325,39327,39328,39330,39331,39333,39334,39336-39338,39340-39342,39344,39348-39350,39352-39355,39357,39358,39360-39362,39364-39366,39368-39370,39372,39373
    24 // 37478-37480,37482-37484,37486,37487,37489-37491,37493-37495,37497-37499,37501-37502,37504-37505,37507-37508,37510-37512,37514,37516-37519,37521,37522,37524,37525,37527-37529,37531,37532,37534,37535,37537-37539,37541-37544,37546-37551,37553-37555
     20PCRUNS 45380
     21CRUNS  45419
     22DRUNS  45428
    2523
    2624// output file name
     
    5452// 11: kDefault(F factor) + bad pixel interpolation
    5553// 21: kDemocratic + bad pixel interpolation
    56 CALFLAG 1
     54CALFLAG 11
    5755
    5856// calibration time:
Note: See TracChangeset for help on using the changeset viewer.