Changeset 3255

Timestamp:

02/21/04 02:09:39 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/bootcampstandardanalysis.C (modified) (3 diffs)
• macros/calibration.C (modified) (10 diffs)
• macros/pedphotcalc.C (modified) (4 diffs)
• manalysis/MMcCalibrationUpdate.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -35 +35 @@
    * mcalib/Makefile
    * mcalib/CalibLinkDef.h
+   * macros/calibration.C
+   * macros/bootcampstandardanalysis.C
+   * macros/pedphotcalc.C
  
   - replace MCalibrationCam by MCalibrationChargeCam
+  - replace MCalibrationCalc by MCalibrationChargeCalc
 
 

trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C

@@ -114 +114 @@
     //
 
-    MCalibrationCam         calcam;
+    MCalibrationChargeCam   calcam;
     MExtractedSignalCam     sigcam;
+    MCalibrationChargePINDiode pindiode;
     
+    //
+    // As long, as we don't have digital modules, 
+    // we have to set the color of the pulser LED by hand
+    //
+    calcam.SetColor(MCalibrationChargeCam::kECT1);
+    pindiode.SetColor(MCalibrationChargePINDiode::kECT1);
+
     plist2.AddToList(&geomcam);
     plist2.AddToList(&pedcam);
     plist2.AddToList(&calcam);
     plist2.AddToList(&sigcam);
+    plist2.AddToList(&pindiode);
+
+   // hists
+    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
 
     //tasks
@@ -126 +138 @@
     read2.DisableAutoScheme();
 
-    MExtractPINDiode      pincalc;
-    MExtractBlindPixel    blindcalc;
-    MExtractSignal        sigsig;
-    MCalibrationCalc      calcalc;
-
-    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
-    //
-    // As long, as we don't have digital modules, 
-    // we have to set the color of the pulser LED by hand
-    //
-    calcalc.SetPulserColor(MCalibrationCalc::kECT1);
+    MExtractPINDiode       pincalc;
+    MExtractBlindPixel     blindcalc;
+    MExtractSignal         sigsig;
+    MCalibrationChargeCalc calcalc;
 
     // 
@@ -156 +161 @@
     tlist2.AddToList(&cont);
     //
+    tlist2.AddToList(&fillpin);
     tlist2.AddToList(&calcalc);
-    tlist2.AddToList(&fillpin);
     //
     // Create and setup the eventloop

trunk/MagicSoft/Mars/macros/calibration.C

@@ -23 +23 @@
 \* ======================================================================== */
 
+const TString pedfile = "../20040215_16770_P_OffCrab4_E.root";
+const TString calfile = "../20040215_16771_C_OffCrab4_E.root";
+
 //const TString pedfile = "/mnt/users/mdoro/Mars/Data/20040201_14418_P_OffMrk421-1_E.root";
 //const TString calfile = "/mnt/users/mdoro/Mars/Data/20040201_1441*_C_OffMrk421-1_E.root";
 
-const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14607_P_CrabNebula_E.root";
-const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14608_C_CrabNebula_E.root";
+//const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14607_P_CrabNebula_E.root";
+//const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14608_C_CrabNebula_E.root";
 
 //const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_01_26/20040125_10412_P_Crab-On_E.root";
@@ -43 +46 @@
 
     MStatusDisplay *display = new MStatusDisplay;
-    display->SetUpdateTime(3000);
+    display->SetUpdateTime(500);
     display->Resize(850,700);
 
@@ -110 +113 @@
     // Look at one specific pixel, after all the histogram manipulations:
     //
-    hpedcam[9].DrawClone("fourier");
+    hpedcam[9].DrawClone("fourierevents");
 
 
@@ -218 +221 @@
 
     MExtractedSignalCam     sigcam;
-    MCalibrationCam         calcam;
+    MCalibrationChargeCam   calcam;
     MHCalibrationRelTimeCam timecam;
     //
@@ -244 +247 @@
     // thus take the sliding window
     //          
-    MExtractPINDiode     pincalc;
-    MExtractBlindPixel   blindcalc;
-    MExtractSignal2      sigcalc2;
-    MArrivalTimeCalc2    timecalc;
-    MCalibrationCalc     calcalc;
+    MExtractPINDiode       pincalc;
+    MExtractBlindPixel     blindcalc;
+    MExtractSignal2        sigcalc2;
+    MArrivalTimeCalc2      timecalc;
+    MCalibrationChargeCalc calcalc;
 
     MFillH filltime("MHCalibrationRelTimeCam", "MArrivalTime");
@@ -274 +277 @@
     // we have to set the color of the pulser LED by hand
     //
-    calcalc.SetPulserColor(MCalibrationCalc::kECT1);
+//    calcalc.SetPulserColor(MCalibrationCalc::kECT1);
 
     //
@@ -338 +341 @@
     // print the most important results of all pixels
     //
-    //    calcam.Print();
+    calcam.Print();
 
     //
     // just one example how to get the plots of individual pixels
     //
-    //  calcam[563].DrawClone();
-    //  calcam[564].DrawClone();
+    calcam[564].DrawClone();
 
     // Create histograms to display
@@ -559 +561 @@
     CamDraw(c9,disp21,calcam,2,2,2);
 
-
     // Rel. Times
     TCanvas &c10 = display->AddTab("Fitted Rel. Times");
@@ -581 +582 @@
     CamDraw(c12,disp27,calcam,1,2,2);
     CamDraw(c12,disp28,calcam,2,2,2);
-
 }
 
@@ -603 +603 @@
       TH1D *obj2 = (TH1D*)obj1->Projection();
       
+      obj2->Sumw2();
       obj2->Draw();
       obj2->SetBit(kCanDelete);
-      
 
       const Double_t min   = obj2->GetBinCenter(obj2->GetXaxis()->GetFirst());

trunk/MagicSoft/Mars/macros/pedphotcalc.C

@@ -34 +34 @@
 #include "MGeomCamMagic.h"
 #include "MEvtLoop.h"
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MExtractedSignalCam.h"
 #include "MExtractSignal.h" 
-#include "MCalibrationCalc.h"
+#include "MCalibrationChargeCalc.h"
 #include "MCerPhotEvt.h"
 #include "MCalibrate.h"
@@ -109 +109 @@
   
   // containers  
-  MCalibrationCam     calcam;
-  MExtractedSignalCam sigcam;
+  MCalibrationChargeCam calcam;
+  MExtractedSignalCam   sigcam;
   
   plist2.AddToList(&geomcam);
@@ -121 +121 @@
   read2.DisableAutoScheme();
   
-  MExtractPINDiode     pincalc;
-  MExtractBlindPixel   blindcalc;
-  MExtractSignal       sigcalc;
-  MCalibrationCalc     calcalc;
+  MExtractPINDiode       pincalc;
+  MExtractBlindPixel     blindcalc;
+  MExtractSignal         sigcalc;
+  MCalibrationChargeCalc calcalc;
   
   MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
   // 
   // Apply a filter against cosmics
-  // (was directly in MCalibrationCalc in earlier versions)
+  // (was directly in MCalibrationChargeCalc in earlier versions)
   //
   MFCosmics            cosmics;
   MContinue            cont(&cosmics);
 
-  //
-  // As long as we don't have digital modules, 
-  // we have to set the color of the pulser LED by hand
-  //
-  calcalc.SetPulserColor(MCalibrationCalc::kECT1);
-  
   tlist2.AddToList(&read2);
   tlist2.AddToList(&geomapl);
@@ -151 +145 @@
   tlist2.AddToList(&cont);
   //
+  tlist2.AddToList(&fillpin);
   tlist2.AddToList(&calcalc);
-  tlist2.AddToList(&fillpin);
   
   // Execute second loop (calibration)

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -39 +39 @@
 //   MMcFadcHeader
 //   MRawRunHeader
-//  [MCalibrationCam] (if it existed previously)
+//  [MCalibrationChargeCam] (if it existed previously)
 //
 //  Output Containers:
 //   MPedPhotCam
-//  [MCalibrationCam] (if it did not exist previously)
+//  [MCalibrationChargeCam] (if it did not exist previously)
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -54 +54 @@
 
 #include "MCalibrationPix.h"
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MExtractedSignalCam.h"
 #include "MExtractedSignalPix.h"
@@ -108 +108 @@
 Int_t MMcCalibrationUpdate::PreProcess(MParList *pList)
 {
-  fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
+  fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
   if ( !fCalCam )
     {
-      *fLog << inf << dbginf << AddSerialNumber("MCalibrationCam") << " does not exist... Creating." << endl;
-
-      fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
+      *fLog << inf << dbginf << AddSerialNumber("MCalibrationChargeCam") << " does not exist... Creating." << endl;
+
+      fCalCam = (MCalibrationChargeCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationChargeCam"));
       if ( !fCalCam )
         {
-          *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationCam") << "... aborting." << endl;
+          *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationChargeCam") << "... aborting." << endl;
           return kFALSE;
         }
@@ -123 +123 @@
     {
       fFillCalibrationCam = kFALSE;
-      *fLog << inf << AddSerialNumber("MCalibrationCam") << " already exists... " << endl;
+      *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " already exists... " << endl;
     }
 
@@ -148 +148 @@
 // Check for the runtype.
 // Search for MGeomCam and MMcFadcHeader.
-// Fill the MCalibrationCam object.
+// Fill the MCalibrationChargeCam object.
 //
 Bool_t MMcCalibrationUpdate::ReInit(MParList *pList)