Changeset 5775 for trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

Timestamp:

01/10/05 17:51:04 (20 years ago)

Author:

rico

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc (modified) (11 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

@@ -6 +6 @@
 #include "TArrayS.h"
 
+#include "MArray.h"
+#include "MParContainer.h"
 #include "MParList.h"
 #include "MTaskList.h"
@@ -34 +36 @@
 #include "MCerPhotEvt.h"
 #include "MPedPhotCam.h"
+#include "MArrivalTime.h"
 #include "MCalibrateData.h"
 #include "MPedPhotCalc.h"
@@ -60 +63 @@
 
 #include "TApplication.h"
+#include "TClass.h"
 
 #include <iostream>
@@ -101 +105 @@
 
 const TString defaultcard="makehillas.datacard";
-char* chext[3]={"Fixed window","Sliding window","Peak Search"};
+char* chext[4]={"Fixed window","Sliding window","Peak Search","Spline"};
 /*************************************************************/
 static void Usage()
@@ -117 +121 @@
   TApplication app("Application",0,0);
 
+  // to deal correctly with the streamer
+  MArray::Class()->IgnoreTObjectStreamer();
+  MParContainer::Class()->IgnoreTObjectStreamer();
+
   // evaluate arguments
   MArgs arg(argc, argv);
@@ -158 +166 @@
     case 3:
       extractor = new MExtractTimeAndChargeSpline();
+      ((MExtractTimeAndChargeSpline*)extractor)->SetTimeType(MExtractTimeAndChargeSpline::kHalfMaximum);
       ((MExtractTimeAndChargeSpline*)extractor)->SetChargeType(MExtractTimeAndChargeSpline::kIntegral);      
       ((MExtractTimeAndChargeSpline*)extractor)->SetRiseTime((Float_t)wsize*0.25); 
       ((MExtractTimeAndChargeSpline*)extractor)->SetFallTime((Float_t)wsize*0.75);
-      ((MExtractTimeAndChargeSpline*)extractor)->SetTimeType(MExtractTimeAndChargeSpline::kHalfMaximum);
       break;
     default:
@@ -210 +218 @@
     }
 
-  MPedestalCam pedcammean = pedloop1.GetPedestalCam();      
+  MPedestalCam& pedcammean = pedloop1.GetPedestalCam();      
   extractor->SetPedestals(&pedcammean);
 
@@ -228 +236 @@
     if (!calloop.Process(pedcammean))
       return;
+
+  MCalibrationChargeCam &chargecam = calloop.GetCalibrationCam();
+  chargecam.Print();
 
 
@@ -316 +327 @@
       plist4.AddToList(&tlist4);
       plist4.AddToList(&geomcam);
-      
+      plist4.AddToList(&pedcamrms);
+
       //tasks
       MReadMarsFile read4("Events");
@@ -351 +363 @@
   MCerPhotEvt     nphot;
   MPedPhotCam     nphotrms;
+  MArrivalTime    arrtime;
   MHillas         hillas;
   MNewImagePar    newimagepar;
@@ -382 +395 @@
   plist5.AddToList(&nphot);
   plist5.AddToList(&nphotrms);
+  plist5.AddToList(&arrtime);
   plist5.AddToList(&source);
   plist5.AddToList(&hillas);