Changeset 3140 for trunk/MagicSoft/Mars/manalysis

Timestamp:

02/13/04 15:28:02 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MPedestalWorkaround.cc (modified) (7 diffs)
• MSupercuts.cc (modified) (2 diffs)
• MSupercutsCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MPedestalWorkaround.cc

@@ -51 +51 @@
 #include "MGeomCam.h"
 
-#include "MPedestalCam.h"
-#include "MPedestalPix.h"
 #include "MPedPhotCam.h"
+#include "MPedPhotPix.h"
 #include "MMcEvt.hxx"
 #include "MRawRunHeader.h"
@@ -73 +72 @@
 Int_t MPedestalWorkaround::PreProcess(MParList *pList)
 {
+  /*
    fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
    if (!fPed)
@@ -79 +79 @@
        return kFALSE;
      }
+  */
 
    fPedPhot = (MPedPhotCam*)pList->FindObject("MPedPhotCam");
@@ -101 +102 @@
    }
 
-   fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
+   fMcEvt = (MMcEvt*)pList->FindCreateObj("MMcEvt");
    if (!fMcEvt)
    {
@@ -119 +120 @@
   // from MPedPhotCam into MPedestalCam   
 
+  // set pedestalRMS = 0 if it is too high
   UInt_t imaxnumpix = fCam->GetNumPixels();
-
   for (UInt_t i=0; i<imaxnumpix; i++)
   {
-    Int_t type = 0;
-    Double_t val;
-    Float_t valout;
-    fPedPhot->GetPixelContent( val, i, *fCam, type);
-    valout = (*fPed)[i].GetPedestal();
-    (*fPed)[i].SetPedestal(val);
-    *fLog << "i, val, valout : " << i <<",  "<<  val<<",  " << valout << endl;
-    type = 1;
-    fPedPhot->GetPixelContent( val, i, *fCam, type);
-    valout = (*fPed)[i].GetPedestalRms();
-    (*fPed)[i].SetPedestalRms(val);
-    *fLog << "RMS : i, val, valout : " << i <<",  "<<  val<<",  " << valout 
-          << endl;
+    Double_t val = (*fPedPhot)[i].GetRms();
+    if (val < 0.0 || val > 10.0)
+      (*fPedPhot)[i].SetRms(0.0);
   }
 
@@ -142 +133 @@
   // put the zenith angle into MMcEvt
 
-  Int_t run = fRun->GetRunNumber();
   Double_t thetadeg;
   Double_t thetarad;
+
+
+  /*
+  Int_t run = fRun->GetRunNumber();
 
   if      (run == 3127)  thetadeg = 27.2;  // Crab
@@ -537 +531 @@
 
   thetarad = thetadeg / kRad2Deg;
+  */
+
+  thetadeg = 10.0;
+  thetarad = thetadeg / kRad2Deg;
   fMcEvt->SetTelescopeTheta(thetarad);
   

trunk/MagicSoft/Mars/manalysis/MSupercuts.cc

@@ -74 +74 @@
 {
     //---------------------------------------------------
-    //  these are Daniel's original values for Mkn 421
-
-    fLengthUp[0] =  0.315585;
-    fLengthUp[1] =  0.001455;
-    fLengthUp[2] =  0.203198;
-    fLengthUp[3] =  0.005532;
-    fLengthUp[4] = -0.001670;
-    fLengthUp[5] = -0.020362;
-    fLengthUp[6] =  0.007388;
-    fLengthUp[7] = -0.013463;
-
-    fLengthLo[0] =  0.151530;
-    fLengthLo[1] =  0.028323;
-    fLengthLo[2] =  0.510707;
-    fLengthLo[3] =  0.053089;
-    fLengthLo[4] =  0.013708;
-    fLengthLo[5] =  2.357993;
-    fLengthLo[6] =  0.000080;
-    fLengthLo[7] = -0.007157;
-
-    fWidthUp[0] =  0.145412;
-    fWidthUp[1] = -0.001771;
-    fWidthUp[2] =  0.054462;
-    fWidthUp[3] =  0.022280;
-    fWidthUp[4] = -0.009893;
-    fWidthUp[5] =  0.056353;
-    fWidthUp[6] =  0.020711;
-    fWidthUp[7] = -0.016703;
-
-    fWidthLo[0] =  0.089187;
-    fWidthLo[1] = -0.006430;
-    fWidthLo[2] =  0.074442;
-    fWidthLo[3] =  0.003738;
-    fWidthLo[4] = -0.004256;
-    fWidthLo[5] = -0.014101;
-    fWidthLo[6] =  0.006126;
-    fWidthLo[7] = -0.002849;
-
-    fDistUp[0] =  1.787943;
-    fDistUp[1] =  0;
-    fDistUp[2] =  2.942310;
-    fDistUp[3] =  0.199815;
-    fDistUp[4] =  0;
-    fDistUp[5] =  0.249909;
-    fDistUp[6] =  0.189697;
-    fDistUp[7] =  0;
-
-    fDistLo[0] =  0.589406;
-    fDistLo[1] =  0;
-    fDistLo[2] = -0.083964;
-    fDistLo[3] = -0.007975;
-    fDistLo[4] =  0;
-    fDistLo[5] =  0.045374;
-    fDistLo[6] = -0.001750;
-    fDistLo[7] =  0;
+    //  these are the default values
+
+    fLengthUp[0] =  0.2;
+    fLengthUp[1] =  0.0;
+    fLengthUp[2] =  0.0;
+    fLengthUp[3] =  0.0;
+    fLengthUp[4] =  0.0;
+    fLengthUp[5] =  0.0;
+    fLengthUp[6] =  0.0;
+    fLengthUp[7] =  0.0;
+
+    fLengthLo[0] =  0.;
+    fLengthLo[1] =  0.;
+    fLengthLo[2] =  0.;
+    fLengthLo[3] =  0.;
+    fLengthLo[4] =  0.;
+    fLengthLo[5] =  0.;
+    fLengthLo[6] =  0.;
+    fLengthLo[7] =  0.;
+
+    fWidthUp[0] =  0.1;
+    fWidthUp[1] =  0.0;
+    fWidthUp[2] =  0.0;
+    fWidthUp[3] =  0.0;
+    fWidthUp[4] =  0.0;
+    fWidthUp[5] =  0.0;
+    fWidthUp[6] =  0.0;
+    fWidthUp[7] =  0.0;
+
+    fWidthLo[0] =  0.;
+    fWidthLo[1] =  0.;
+    fWidthLo[2] =  0.;
+    fWidthLo[3] =  0.;
+    fWidthLo[4] =  0.;
+    fWidthLo[5] =  0.;
+    fWidthLo[6] =  0.;
+    fWidthLo[7] =  0.;
+
+    fDistUp[0] =  1.e10;
+    fDistUp[1] =  0.0;
+    fDistUp[2] =  0.0;
+    fDistUp[3] =  0.0;
+    fDistUp[4] =  0.0;
+    fDistUp[5] =  0.0;
+    fDistUp[6] =  0.0;
+    fDistUp[7] =  0.0;
+
+    fDistLo[0] =  0.0;
+    fDistLo[1] =  0.0;
+    fDistLo[2] =  0.0;
+    fDistLo[3] =  0.0;
+    fDistLo[4] =  0.0;
+    fDistLo[5] =  0.0;
+    fDistLo[6] =  0.0;
+    fDistLo[7] =  0.0;
     
 
@@ -202 +202 @@
 
     // LengthUp
-    fStepsizes[0] = 0.03;
-    fStepsizes[1] = 0.0002;
-    fStepsizes[2] = 0.02;
-    fStepsizes[3] = 0.0006;
-    fStepsizes[4] = 0.0002;
-    fStepsizes[5] = 0.002;
-    fStepsizes[6] = 0.0008;
-    fStepsizes[7] = 0.002;
+    fStepsizes[0] = 0.02;
+    fStepsizes[1] = 0.0;
+    fStepsizes[2] = 0.0;
+    fStepsizes[3] = 0.0;
+    fStepsizes[4] = 0.0;
+    fStepsizes[5] = 0.0;
+    fStepsizes[6] = 0.0;
+    fStepsizes[7] = 0.0;
 
     // LengthLo
-    fStepsizes[8]  = 0.02;
-    fStepsizes[9]  = 0.003;
-    fStepsizes[10] = 0.05;
-    fStepsizes[11] = 0.006;
-    fStepsizes[12] = 0.002;
-    fStepsizes[13] = 0.3;
-    fStepsizes[14] = 0.0001;
-    fStepsizes[15] = 0.0008;
+    fStepsizes[8]  = 0.0;
+    fStepsizes[9]  = 0.0;
+    fStepsizes[10] = 0.0;
+    fStepsizes[11] = 0.0;
+    fStepsizes[12] = 0.0;
+    fStepsizes[13] = 0.0;
+    fStepsizes[14] = 0.0;
+    fStepsizes[15] = 0.0;
 
     // WidthUp
-    fStepsizes[16] = 0.02;
-    fStepsizes[17] = 0.0002;
-    fStepsizes[18] = 0.006;
-    fStepsizes[19] = 0.003;
-    fStepsizes[20] = 0.002;
-    fStepsizes[21] = 0.006;
-    fStepsizes[22] = 0.002;
-    fStepsizes[23] = 0.002;
+    fStepsizes[16] = 0.01;
+    fStepsizes[17] = 0.0;
+    fStepsizes[18] = 0.0;
+    fStepsizes[19] = 0.0;
+    fStepsizes[20] = 0.0;
+    fStepsizes[21] = 0.0;
+    fStepsizes[22] = 0.0;
+    fStepsizes[23] = 0.0;
 
     // WidthLo
-    fStepsizes[24] = 0.009;
-    fStepsizes[25] = 0.0007;
-    fStepsizes[26] = 0.008;
-    fStepsizes[27] = 0.0004;
-    fStepsizes[28] = 0.0005;
-    fStepsizes[29] = 0.002;
-    fStepsizes[30] = 0.0007;
-    fStepsizes[31] = 0.003;
+    fStepsizes[24] = 0.0;
+    fStepsizes[25] = 0.0;
+    fStepsizes[26] = 0.0;
+    fStepsizes[27] = 0.0;
+    fStepsizes[28] = 0.0;
+    fStepsizes[29] = 0.0;
+    fStepsizes[30] = 0.0;
+    fStepsizes[31] = 0.0;
 
     // DistUp
-    fStepsizes[32] = 0.2;
+    fStepsizes[32] = 0.0;
     fStepsizes[33] = 0.0;
-    fStepsizes[34] = 0.3;
-    fStepsizes[35] = 0.02;
+    fStepsizes[34] = 0.0;
+    fStepsizes[35] = 0.0;
     fStepsizes[36] = 0.0;
-    fStepsizes[37] = 0.03;
-    fStepsizes[38] = 0.02;
+    fStepsizes[37] = 0.0;
+    fStepsizes[38] = 0.0;
     fStepsizes[39] = 0.0;
 
     // DistLo
-    fStepsizes[40] = 0.06;
+    fStepsizes[40] = 0.0;
     fStepsizes[41] = 0.0;
-    fStepsizes[42] = 0.009;
-    fStepsizes[43] = 0.0008;
+    fStepsizes[42] = 0.0;
+    fStepsizes[43] = 0.0;
     fStepsizes[44] = 0.0;
-    fStepsizes[45] = 0.005;
-    fStepsizes[46] = 0.0002;
+    fStepsizes[45] = 0.0;
+    fStepsizes[46] = 0.0;
     fStepsizes[47] = 0.0;
 

trunk/MagicSoft/Mars/manalysis/MSupercutsCalc.cc

@@ -157 +157 @@
     // define cut-function
     //
-    //    dNOMLOGSIZE = 4.1 (=log(60.0)
+    //    dNOMLOGSIZE = 5.0 (=log(150.0)
     //    dNOMCOSZA   = 1.0
     //