Changeset 5764 for trunk/MagicSoft


Ignore:
Timestamp:
01/10/05 11:49:28 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r5760 r5764  
    3232     - added two new possible UnCalibrated_t flags for the hi-lo
    3333       calibration
     34
     35   * macros/calibration.C
     36     - add the calls to:
     37          MArray::Class()->IgnoreTObjectStreamer();
     38          MParContainer::Class()->IgnoreTObjectStreamer();
     39       in main.
    3440
    3541
  • trunk/MagicSoft/Mars/macros/calibration.C

    r5737 r5764  
    5555//
    5656//////////////////////////////////////////////////////////////////////////////////////////
     57#include <TStyle.h>
     58#include <TObject.h>
     59#include <TObjectTable.h>
     60#include <TCanvas.h>
     61#include <TPad.h>
     62#include <TH1.h>
     63#include <TPaveStats.h>
     64#include <TApplication.h>
     65#include <TClass.h>
     66
    5767#include "getExtractor.C"
    5868
     
    7181#include "MGeomCamMagic.h"
    7282
    73 #include "TStyle.h"
    74 #include "TObject.h"
    75 #include "TObjectTable.h"
    76 #include "TCanvas.h"
    77 #include "TPad.h"
    78 #include "TH1.h"
    79 #include "TPaveStats.h"
    80 
    8183using namespace std;
    8284
     
    101103// the default start data run
    102104//
    103 static const Int_t   datrun1 = 39900;
     105static const Int_t   datrun1 = 39000;
    104106//
    105107// the default last calibration run (if 0, only one run is taken, otherwise consecutive runs
     
    299301    return 2;
    300302
    301   //  return 0;
    302303  //
    303304  // The next lines are the use the Print() function and have
     
    367368    calibloop.SetDisplay(display);
    368369  calibloop.SetBadPixels(calloop.GetBadPixels());
    369   calibloop.SetNoStorage(!usestorage);
     370  calibloop.SetNoStorage(!useStorage);
    370371 
    371372  if (!calibloop.ProcessFile(pedloop1.GetPedestalCam(),timeandcharge ? pedloop2.GetPedestalCam() : pedloop1.GetPedestalCam(), calloop.GetCalibrationCam(),calloop.GetQECam(), calloop.GetRelTimeCam()))
     
    475476int main(int argc, char **argv)
    476477{
     478
     479
     480  MArray::Class()->IgnoreTObjectStreamer();
     481  MParContainer::Class()->IgnoreTObjectStreamer();
    477482  //
    478483  // Evaluate arguments
Note: See TracChangeset for help on using the changeset viewer.