Changeset 7109 for trunk/MagicSoft/Mars/mhflux

Timestamp:

05/30/05 18:12:10 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• FluxLinkDef.h (modified) (2 diffs)
• MHDisp.cc (added)
• MHFalseSource.cc (modified) (4 diffs)
• MHFalseSource.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mhflux/FluxLinkDef.h

@@ -7 +7 @@
 #pragma link C++ class MAlphaFitter+;
 
+#pragma link C++ class MHDisp+;
 #pragma link C++ class MHAlpha+;
 #pragma link C++ class MHThetaSq+;
@@ -13 +14 @@
 #pragma link C++ class MHEffectiveOnTime+;
 #pragma link C++ class MHCollectionArea+;
+#pragma link C++ class MMcSpectrumWeight+;
+
+//#pragma link C++ class MMatrixHist+;
+//#pragma link C++ class MMatrixUnfold+;
+//#pragma link C++ class MUnfoldBert+;
 
 #endif

trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc

@@ -246 +246 @@
     fMm2Deg = geom->GetConvMm2Deg();
 
-    if (fName!=(TString)"MHFalseSourceOff" && fHistOff==NULL)
-    {
-        MHFalseSource *hoff = (MHFalseSource*)plist->FindObject("MHFalseSourceOff", "MHFalseSource");
+    const TString off(Form("%sOff", fName.Data()));
+    if (fName!=off && fHistOff==NULL)
+    {
+        const TString desc(Form("%s [%s] found... using ", off.Data(), ClassName()));
+        MHFalseSource *hoff = (MHFalseSource*)plist->FindObject(off, ClassName());
         if (!hoff)
-            *fLog << inf << "No MHFalseSourceOff [MHFalseSource] found... using current data only!" << endl;
+            *fLog << inf << "No " << desc << "current data only!" << endl;
         else
         {
-            *fLog << inf << "MHFalseSource [MHFalseSource] found... using on-off mode!" << endl;
+            *fLog << inf << desc << "on-off mode!" << endl;
             SetOffData(*hoff);
         }
@@ -294 +296 @@
         *fLog << warn << "MObservatory not found... no derotation." << endl;
 
+    MPointingPos *point = (MPointingPos*)plist->FindObject("MSourcePos", "MPointingPos");
+    if (!point)
+        point = fPointPos;
+
     // FIXME: Because the pointing position could change we must check
     // for the current pointing position and add a offset in the
     // Fill function!
-    fRa  = fPointPos ? fPointPos->GetRa()  :  0;
-    fDec = fPointPos ? fPointPos->GetDec() : 90;
+    fRa  = point ? point->GetRa()  :  0;
+    fDec = point ? point->GetDec() : 90;
 
     return kTRUE;
@@ -615 +621 @@
                 const Int_t l = h0->GetXaxis()->FindFixBin(fAlphaCut*3)+f-1;
                 h0->Scale(h1->Integral(f, l)/h0->Integral(f, l));
+
+
                 //h0->Scale(h1->GetEntries()/h0->GetEntries());
 
@@ -854 +862 @@
 }
 
-Double_t FcnGauss2d(Double_t *x, Double_t *par)
+static Double_t FcnGauss2d(Double_t *x, Double_t *par)
 {
     TVector2 v = TVector2(x[0], x[1]).Rotate(par[5]*TMath::DegToRad());

trunk/MagicSoft/Mars/mhflux/MHFalseSource.h

@@ -20 +20 @@
 class MHFalseSource : public MH
 {
-private:
+protected:
     MTime         *fTime;        //! container to take the event time from
     MPointingPos  *fPointPos;    //! container to take pointing position from
@@ -28 +28 @@
     Float_t fMm2Deg;             // conversion factor for display in degrees
 
+private:
     Float_t fAlphaCut;           // Alpha cut
     Float_t fBgMean;             // Background mean
@@ -37 +38 @@
     Float_t fMaxDW;              // Maximum distance in percent of dist
 
+protected:
     TH3D    fHist;               // Alpha vs. x and y
 
@@ -44 +46 @@
     Double_t fDec;
 
+private:
     Int_t DistancetoPrimitive(Int_t px, Int_t py);
     void Modified();