Changeset 4826

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (4 diffs)
• mfileio/MWriteRootFile.h (modified) (4 diffs)
• mgeom/MGeomPix.cc (modified) (1 diff)
• mgeom/MGeomPix.h (modified) (2 diffs)
• mhist/MHAlpha.cc (modified) (1 diff)
• mhist/MHFalseSource.cc (modified) (4 diffs)
• mhist/MHFalseSource.h (modified) (2 diffs)
• mimage/MHHillasSrc.cc (modified) (3 diffs)
• mimage/MHillas.cc (modified) (1 diff)
• mimage/MHillasExt.cc (modified) (1 diff)
• mimage/MHillasSrc.cc (modified) (2 diffs)
• mimage/MImagePar.cc (modified) (1 diff)
• mimage/MImgCleanStd.cc (modified) (1 diff)
• mimage/MNewImagePar.cc (modified) (1 diff)
• mpointing/Makefile (modified) (1 diff)
• mpointing/PointingLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/09/1: Thomas Bretz
+
+   * mfileio/MWriteRootFile.[h,cc]:
+     - do not add a container which is already in the list
+     - replaced fNameCont by fTitle in MRootFileBranch
+
+   * mgeom/MGeomPix.[h,cc]:
+     - declared tan(30)
+     - added GetL member function
+
+   * mhist/MHAlpha.cc:
+     - added a logging output
+
+   * mhist/MHFalseSource.[h,cc]:
+     - shift by MSrcPosCam introduced
+     - fixed on-off plot
+     - fixed changed return value MHillasSrc::Calc
+     - as a workaround for some crashes removed SetBit(kCanDelete)
+       of catalog
+
+   * mimage/MHHillasSrc.cc, mimage/MHillasSrc.cc:
+     - some small fixes to new plots
+     - some cosmetics to the code
+
+   * mimage/MHillas.cc, mimage/MHillasExt.cc, 
+     mimage/MImagePar.cc, mimage/MImgCleanStd.cc,
+     mimage/MNewImagePar.cc:
+     - removed obsolete include of fstream
+
+   * mpointing/Makefile, mpointing/PointingLinkDef.h:
+     - added new class MPointingPosFromModel
+     
+   * mpointing/MPointingPosFromModel.[h,cc]:
+     - added
+
+
+
  2004/08/31: Daniel Mazin
 
    * manalysis/MSigmabarCalc.h:
-     - added function SetNamePedPhotCam to set the name of the MPedPhotCam container
+     - added function SetNamePedPhotCam to set the name of the 
+       MPedPhotCam container
+
+
 
  2004/08/31: Thomas Bretz

trunk/MagicSoft/Mars/NEWS

@@ -54 +54 @@
    - The the mars-executable Camera Display can now also read
      calibrated data files written by callisto/MJCalibrateSignal
+
+   - Added a new class which can calculate the source position in
+     the camera from a pointing model known to be correct and
+     the pointing model used for observations (MSrcPosFromModel)
 
 

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -233 +233 @@
         name += branch->GetName();
 
-        *fLog << " " << name.Strip(TString::kTrailing, '.') << ": \t" << branch->GetEntries() << " entries." << endl;
+        *fLog << " " << name.Strip(TString::kTrailing, '.') << ": \t" << (ULong_t)branch->GetEntries() << " entries." << endl;
     }
 
@@ -240 +240 @@
     while ((t=(TTree*)NextTree()))
         if (t->TestBit(kIsNewTree))
-            *fLog << " " << t->GetName() << ": \t" << t->GetEntries() << " entries." << endl;
+            *fLog << " " << t->GetName() << ": \t" << (ULong_t)t->GetEntries() << " entries." << endl;
     *fLog << endl;
 }
@@ -257 +257 @@
 void MWriteRootFile::AddContainer(const char *cname, const char *tname, Bool_t must)
 {
+    TIter Next(&fBranches);
+    TObject *o=0;
+    while ((o=Next()))
+        if (TString(o->GetName())==TString(tname) && TString(o->GetTitle())==TString(cname))
+        {
+            *fLog << "WARNING - Container '" << cname << "' in Tree '" << tname << "' already scheduled... ignored." << endl;
+            return;
+        }
+
     //
     // create a new entry in the list of branches to write and
@@ -281 +290 @@
                                   Bool_t must)
 {
+    TIter Next(&fBranches);
+    TObject *o=0;
+    while ((o=Next()))
+        if (TString(o->GetName())==TString(tname) &&
+            static_cast<MRootFileBranch*>(o)->GetContainer()==cont)
+        {
+            *fLog << "WARNING - Container " << cont << " in Tree '" << tname << "' already scheduled... ignored." << endl;
+            return;
+        }
+
     //
     // create a new entry in the list of branches to write and

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -23 +23 @@
 
     MParContainer *fContainer;
-    TString        fContName;
 
     Bool_t         fMust;
@@ -37 +36 @@
     {
         Init(NULL, kFALSE);
-        fContName = "";
+        fTitle = "";
     }
 
@@ -44 +43 @@
     {
         Init(tname, must);
-        fContName = cname;
+        fTitle = cname;
     }
 
     MRootFileBranch(MParContainer *cont, const char *tname=NULL, Bool_t must=kFALSE)
-        : fTree(NULL), fBranch(NULL), fContName(""), fMust(0)
+        : fTree(NULL), fBranch(NULL), fMust(0)
     {
         Init(tname, must);
+        fTitle = "";
         fContainer = cont;
     }
@@ -58 +58 @@
     void          *GetAddress()         { return &fContainer; }
     TBranch       *GetBranch() const    { return fBranch; }
-    const char    *GetContName() const  { return fContName; }
+    const char    *GetContName() const  { return fTitle; }
     Bool_t         MustHave() const     { return fMust; }
 

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -65 +65 @@
 using namespace std;
 
+const Float_t MGeomPix::gsTan30 = tan(30/kRad2Deg);
 const Float_t MGeomPix::gsTan60 = tan(60/kRad2Deg);
 

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -12 +12 @@
 private:
     static const Float_t gsTan60; // tan(60/kRad2Deg);
+    static const Float_t gsTan30; // tan(30/kRad2Deg);
 
     enum {
@@ -45 +46 @@
     Float_t GetY() const  { return fY; }
     Float_t GetD() const  { return fD; }
+    Float_t GetL() const  { return fD*gsTan30; } // Length of one of the parallel sides
     UInt_t  GetSector() const { return fSector; }
 

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
 

trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc

@@ -73 +73 @@
     fDist  = new TH1F("Dist",  "Dist of Ellipse",                 100,   0, 445);
     fCosDA = new TH1F("CosDA", "cos(Delta,Alpha) of Ellipse",     101,  -1,   1);
-    fDCA   = new TH1F("DCA",   "Distance of closest aproach",     101,  -1,   1);
-    fDCADelta  = new TH1F("DCADelta",  "Angle between shower and x-axis", 101,   0, 360);
+    fDCA   = new TH1F("DCA",   "Distance of closest aproach",     101,  -500,   500);
+    fDCADelta = new TH1F("DCADelta", "Angle between shower and x-axis", 101,   0, 360);
 
     fAlpha->SetDirectory(NULL);
@@ -132 +132 @@
     ApplyBinning(*plist, "Dist",     fDist);
     ApplyBinning(*plist, "DCA",      fDCA);
-    ApplyBinning(*plist, "DCADelta",     fDCADelta);
+    ApplyBinning(*plist, "DCADelta", fDCADelta);
 
     return kTRUE;
@@ -203 +203 @@
 
     fDist->SetXTitle(mmscale ? "Dist [mm]" : "Dist [\\circ]");
-    fDCA->SetXTitle(mmscale ? "DCA [mm]" : "DCA [\\circ]");
+    fDCA ->SetXTitle(mmscale ? "DCA [mm]"  : "DCA [\\circ]");
 
     fUseMmScale = mmscale;

trunk/MagicSoft/Mars/mimage/MHillas.cc

@@ -60 +60 @@
 #include "MHillas.h"
 
-#include <fstream>
-
 #include <TArrayF.h>
 #include <TEllipse.h>

trunk/MagicSoft/Mars/mimage/MHillasExt.cc

@@ -63 +63 @@
 #include "MHillasExt.h"
 
-#include <fstream>
 #include <TArrayF.h>
 

trunk/MagicSoft/Mars/mimage/MHillasSrc.cc

@@ -69 +69 @@
 #include "MHillasSrc.h"
 
-#include <fstream>
 #include <TArrayF.h>
 
@@ -99 +98 @@
 
     fDCA           = -1;
-    fDCADelta          =  0;
+    fDCADelta      =  0;
 }
 

trunk/MagicSoft/Mars/mimage/MImagePar.cc

@@ -36 +36 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MImagePar.h"
-
-#include <fstream>
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -605 +605 @@
 
 #ifdef DEBUG
-        *fLog << all << "Calc Islands" << endl;
+    *fLog << all << "Calc Islands" << endl;
 #endif
     // Takes roughly 10% of the time

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -69 +69 @@
 #include "MNewImagePar.h"
 
-#include <fstream>
-
 #include "MLog.h"
 #include "MLogManip.h"

trunk/MagicSoft/Mars/mpointing/Makefile

@@ -26 +26 @@
            MPointingPosCalc.cc \
            MSrcPosCam.cc \
-           MSrcPosCalc.cc
+           MSrcPosCalc.cc \
+           MSrcPosFromModel.cc
 
 ############################################################

trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h

@@ -10 +10 @@
 #pragma link C++ class MPointingPosCalc+;
 
+#pragma link C++ class MSrcPosCam+;
 #pragma link C++ class MSrcPosCalc+;
-#pragma link C++ class MSrcPosCam+;
+#pragma link C++ class MSrcPosFromModel+;
 
 #endif