Changeset 4826 for trunk/MagicSoft/Mars/mhist

Timestamp:

09/01/04 18:06:06 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHAlpha.cc (modified) (1 diff)
• MHFalseSource.cc (modified) (4 diffs)
• MHFalseSource.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/MHAlpha.cc

@@ -138 +138 @@
         const MHillasSrc *hil = dynamic_cast<const MHillasSrc*>(par);
         if (!par)
+        {
+            *fLog << err << dbginf << "MHillasSrc not found... abort." << endl;
             return kFALSE;
+        }
 
         alpha = hil->GetAlpha();

trunk/MagicSoft/Mars/mhist/MHFalseSource.cc

@@ -276 +276 @@
         *fLog << warn << "MTime not found... no derotation." << endl;
 
+    fSrcPos = (MSrcPosCam*)plist->FindObject(AddSerialNumber("MSrcPosCam"));
+    if (!fSrcPos)
+        *fLog << warn << "MSrcPosCam not found... no translation." << endl;
+
     fObservatory = (MObservatory*)plist->FindObject(AddSerialNumber("MObservatory"));
     if (!fObservatory)
@@ -341 +345 @@
             // convert degrees to millimeters
             v *= 1./fMm2Deg;
+
+            if (fSrcPos)
+                v += fSrcPos->GetXY();
+
             src.SetXY(v);
 
             // Source dependant hillas parameters
-            if (!hsrc.Calc(*hil))
+            if (hsrc.Calc(*hil)>0)
             {
                 *fLog << warn << "Calculation of MHillasSrc failed for x=" << cx[ix] << " y=" << cy[iy] << endl;
@@ -498 +506 @@
     if ((h5 = (TH2D*)gPad->FindObject("Alpha_yx_diff")))
     {
-        h5->Add(h3, h2, -1);
+        h5->Add(h2, h3, -1);
         MakeSymmetric(h5);
     }
@@ -575 +583 @@
     *fLog << err << "FIXME - The catalog will never be deleted, because this crashes!" << endl;
 
-    stars->SetBit(kCanDelete);
+//    stars->SetBit(kCanDelete);
 
     return stars;

trunk/MagicSoft/Mars/mhist/MHFalseSource.h

@@ -14 +14 @@
 class MParList;
 class MTime;
+class MSrcPosCam;
 class MPointingPos;
 class MObservatory;
@@ -22 +23 @@
     MTime         *fTime;        //! container to take the event time from
     MPointingPos  *fPointPos;    //! container to take pointing position from
+    MSrcPosCam    *fSrcPos;      //! container for sopurce position in camera
     MObservatory  *fObservatory; //! conteiner to take observatory location from