Changeset 3202 for trunk/MagicSoft/Mars/macros

Timestamp:

02/16/04 16:00:57 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros

Files:

• bootcampstandardanalysis.C (modified) (4 diffs)
• calibration.C (modified) (7 diffs)

trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C

@@ -114 +114 @@
     //
 
-    MCalibrationCam     calcam;
-    MExtractedSignalCam sigcam;
+    MCalibrationCam         calcam;
+    MExtractedSignalCam     sigcam;
     
     plist2.AddToList(&geomcam);
@@ -122 +122 @@
     plist2.AddToList(&sigcam);
 
-
     //tasks
     MReadMarsFile read2("Events", calname);
     read2.DisableAutoScheme();
 
-
+    MExtractPINDiode      pincalc;
+    MExtractBlindPixel    blindcalc;
     MExtractSignal        sigsig;
-    MCalibrationCalc     calcalc;
-
+    MCalibrationCalc      calcalc;
+
+    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
     //
     // As long, as we don't have digital modules, 
@@ -146 +147 @@
     tlist2.AddToList(&read2);
     tlist2.AddToList(&geomapl);
+    tlist2.AddToList(&blindcalc);
+    tlist2.AddToList(&pincalc);
     tlist2.AddToList(&sigsig);
     //
@@ -154 +157 @@
     //
     tlist2.AddToList(&calcalc);
-
+    tlist2.AddToList(&fillpin);
     //
     // Create and setup the eventloop

trunk/MagicSoft/Mars/macros/calibration.C

@@ -66 +66 @@
     MExtractSignal  sigcalc;
 
-
-    MExtractPINDiode pidcalc;
-    MExtractedSignalPINDiode pindiode;
-    //    MHCalibrationChargePINDiode pinhist;
     //
     // Set the extraction range higher:
@@ -82 +78 @@
     //
     MFillH fill("MHPedestalCam", "MExtractedSignalCam");
-    //    MFillH fillp("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
 
     tlist.AddToList(&read);
     tlist.AddToList(&geomapl);
     tlist.AddToList(&sigcalc);
-    tlist.AddToList(&pidcalc);
     tlist.AddToList(&pedcalc);
     tlist.AddToList(&fill);
-    //    tlist.AddToList(&fillp);
 
     MGeomCamMagic  geomcam;
@@ -98 +91 @@
     plist.AddToList(&pedcam);
     plist.AddToList(&hpedcam);
-    plist.AddToList(&pindiode);
-    //    plist.AddToList(&pinhist);
 
     //
     // Create and setup the eventloop
-     //
+    //
     MEvtLoop evtloop;
     evtloop.SetParList(&plist);
@@ -253 +244 @@
     // thus take the sliding window
     //          
+    MExtractPINDiode     pincalc;
+    MExtractBlindPixel   blindcalc;
     MExtractSignal2      sigcalc2;
     MArrivalTimeCalc2    timecalc;
@@ -258 +251 @@
 
     MFillH filltime("MHCalibrationRelTimeCam", "MArrivalTime");
+    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
+
     //
     // Set the range (other than default) 
@@ -314 +309 @@
 
     tlist2.AddToList(&read2);
+    tlist2.AddToList(&blindcalc);
+    tlist2.AddToList(&pincalc);
     tlist2.AddToList(&sigcalc2);
     //
@@ -326 +323 @@
     tlist2.AddToList(&timecalc);
     tlist2.AddToList(&filltime);
+    tlist2.AddToList(&fillpin);
     //
     tlist2.AddToList(&calcalc);