Changeset 8719 for trunk/MagicSoft/Mars/mhflux

Timestamp:

08/28/07 13:03:04 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MHDisp.cc (modified) (9 diffs)
• MHDisp.h (modified) (2 diffs)
• MMcSpectrumWeight.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhflux/MHDisp.cc

@@ -70 +70 @@
 //
 MHDisp::MHDisp(const char *name, const char *title)
-    : fDisp(0), fDeviation(0), fSmearing(-1), fWobble(kFALSE),
+    : fDisp(0), fDeviation(0), fSrcAnti(0), fSmearing(-1), fWobble(kFALSE),
     fScaleMin(0.325), fScaleMax(0.475)
 {
@@ -81 +81 @@
     fHist.SetName("Alpha");
     fHist.SetTitle("3D-plot of ThetaSq vs x, y");
-    fHist.SetXTitle("x [\\circ]");
-    fHist.SetYTitle("y [\\circ]");
+    fHist.SetXTitle("dx [\\circ]");
+    fHist.SetYTitle("dy [\\circ]");
     fHist.SetZTitle("Eq.cts");
 
@@ -112 +112 @@
     }
 
+    if (fWobble)
+    {
+        fSrcAnti = (MSrcPosCam*)plist->FindObject("MSrcPosAnti", "MSrcPosCam");
+        if (!fSrcAnti)
+        {
+            *fLog << err << "MSrcPosAnti [MSrcPosCam] not found... abort." << endl;
+            return kFALSE;
+        }
+
+        *fLog << inf << "Wobble mode initialized. " << endl;
+    }
+
     fDeviation = (MPointingDev*)plist->FindObject("MPointingDev");
     if (!fDeviation)
@@ -132 +144 @@
 // --------------------------------------------------------------------------
 //
-// Calculate the delta angle between fSrcPos->GetXY() and v.
-// Return result in deg.
-//
-Double_t MHDisp::DeltaPhiSrc(const TVector2 &v) const
-{
-    return TMath::Abs(fSrcPos->GetXY().DeltaPhi(v))*TMath::RadToDeg();
-}
-
-// --------------------------------------------------------------------------
-//
 // Fill the histogram. For details see the code or the class description
 // 
@@ -162 +164 @@
     TVector2 pos1 = hil->GetMean()*fMm2Deg + hil->GetNormAxis()*fDisp->GetVal();
 
+    const TVector2 src = fSrcPos->GetXY()*fMm2Deg;
+
     Double_t w0 = 1;
     if (fWobble)
     {
-        const Double_t delta = DeltaPhiSrc(pos1);
+        const TVector2 anti = fSrcAnti->GetXY()*fMm2Deg;
 
         // Skip off-data not in the same half than the source (here: anti-source)
@@ -171 +175 @@
         if (!fHistOff)
         {
-            if (delta>180-25)
+            Double_t r = anti.Mod()>0.2*1.7 ? 0.2*1.7 : anti.Mod();
+
+            // In wobble mode processing the off-data, the anti-source
+            // position is our source position. Check if this is a possible
+            // gamma. If it is, do not fill it into our off-data histogram
+            if ((pos1-anti).Mod()<r)
                 return kTRUE;
 
@@ -181 +190 @@
             // increased uncertainty
             // FIXME: The delta stuff could be replaced by a 2*antitheta cut...
-            w0 = delta>25 ? 1 : 2;
-        }
+            //w0 = delta>25 ? 1 : 2;
+
+            w0 = (pos1+anti).Mod()<r ? 2 : 1;
+        }
+
+        // When processing off-data the anti-source is the real source
+        const TVector2 srcpos = fHistOff ? src : anti;
 
         // Define by the source position which histogram to fill
-        if (DeltaPhiSrc(fFormerSrc)>90)
+        if (TMath::Abs(srcpos.DeltaPhi(fFormerSrc))*TMath::RadToDeg()>90)
             fHalf = !fHalf;
-        fFormerSrc = fSrcPos->GetXY();
+        fFormerSrc = srcpos;
     }
 
@@ -202 +216 @@
         {
             // m: Position of the camera center in the FS plot
-            m = fSrcPos->GetXY().Rotate(-rho)*fMm2Deg;
+            m = src.Rotate(-rho);
             pos1 -= m;
         }
@@ -410 +424 @@
     const TAxis &axey = *h2.GetYaxis();
 
-    const Double_t rmax = (fWobble ? axex.GetXmax()-0.4 : axex.GetXmax()) - axex.GetBinWidth(1);
+    const Double_t rmax = (fWobble ? axex.GetXmax()/*-0.7*/ : axex.GetXmax()) - axex.GetBinWidth(1);
 
     for (int x=1; x<=axex.GetNbins(); x++)

trunk/MagicSoft/Mars/mhflux/MHDisp.h

@@ -25 +25 @@
     MPointingDev *fDeviation; //!
     //MSrcPosCam   *fAxis;      //!
+    MSrcPosCam   *fSrcAnti; //!
+
 
     TH2D         fHistBg;
@@ -41 +43 @@
     // MHDisp
     Double_t GetOffSignal(TH1 &h) const;
-    Double_t DeltaPhiSrc(const TVector2 &v) const;
 
     void Update();

trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc

@@ -493 +493 @@
     if (hasold)
     {
-        *fLog << " Old Spectrum:  " << GetFormulaSpecOldX();
+        *fLog << " Old Spectrum:             " << GetFormulaSpecOldX();
         if (fEnergyMin>=0 && fEnergyMax>0)
             *fLog << "   (I=" << GetSpecOldIntegral() << ")";
@@ -500 +500 @@
     if (hasnew)
     {
-        *fLog << " New Spectrum:  " << GetFormulaSpecNewX();
+        *fLog << " New Spectrum:             " << GetFormulaSpecNewX();
         if (fEnergyMin>=0 && fEnergyMax>0)
             *fLog << "   (I=" << GetSpecNewIntegral() << ")";
@@ -506 +506 @@
     }
     if (fFunc)
-        *fLog << " Weight func:  " << fFunc->GetTitle()   << endl;
+        *fLog << " Weight func:              " << fFunc->GetTitle()   << endl;
 }