Changeset 2132

Timestamp:

05/22/03 06:53:14 (22 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MCT1ReadPreProc.cc (modified) (3 diffs)
• mfileio/MCT1ReadPreProc.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+
+
+ 2003/05/22: Wolfgang Wittek
+
+   * mfileio/MCT1ReadPreProc.[h,cc]
+     - add member function DiscreteTheta
+     - discretize the Theta according to the binning in Theta
+       (for data and MC)
+       original Theta is stored in the container "ThetaOrig"
+       the discretized Theta is stored in MMcEvt.fTelescopeTheta
+
+
  2003/05/21: Thomas Bretz
 

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -832 +832 @@
 // --------------------------------------------------------------------------
 //
+// Discretize Theta according to the binning in Theta
+//   theta [rad]
+//   DiscreteTheta [rad]  (= bin center)
+//
+Double_t MCT1ReadPreProc::DiscreteTheta(Double_t theta)
+{
+    if (!fBinningT)
+        return theta;
+
+    const Int_t bin = fBinningT->FindLoEdge(theta * 180/TMath::Pi());
+    if (bin<0)
+        return theta;
+
+    const Double_t low = fBinningT->GetEdges()[bin];
+    const Double_t up  = fBinningT->GetEdges()[bin+1];
+
+    Double_t discreteTheta = 0.5*(up+low) * TMath::Pi()/180;
+
+    return discreteTheta;
+}
+
+// --------------------------------------------------------------------------
+//
 // Analyse the event data, means store and copy the needed data into
 // Mars structures and data members
@@ -921 +944 @@
     const Double_t theta = TMath::Pi()*(0.5-1./180*event.ialt_arcs/3600);
     fThetaOrig->SetVal(theta);
-
-    //if (theta>TMath::Pi()/2)
-    //{
-    //    *fLog << "MCT1ReadPreProc::ProcessEvent; theta out of range : "
-    //          << theta << endl;
-    //    return kCONTINUE;
-    //}
 
     // store hour angle
@@ -948 +964 @@
                  fIsMcFile ? event.imcimpact_m*100 : 0,
                  TMath::Pi()/180*event.iaz_arcs/3600, // azimuth (arcseconds)
-                 fIsMcFile ? SmearTheta(theta) : theta,
+                 // fIsMcFile ? SmearTheta(theta) : theta,
+                 DiscreteTheta(theta),
                  0, /* fTFirst */
                  0, /* fTLast */

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -72 +72 @@
 
     Double_t SmearTheta(Double_t theta);
+    Double_t DiscreteTheta(Double_t theta);
 
     Bool_t PreProcess(MParList *pList);