Changeset 4357 for trunk

Timestamp:

06/28/04 14:21:08 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (2 diffs)
• caos/Ring.cc (modified) (3 diffs)
• caos/Ring.h (modified) (2 diffs)
• main/MStarguider.cc (modified) (2 diffs)
• tpoint/gui.C (modified) (6 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2004/06/28 - Thomas Bretz
+
+   * caos/Ring.[h,cc]:
+     - added magnitude fMag
+     - added interpolation of magnitude
+
+   * main/MStarguider.cc:
+     - added output of magnitudes
+
+   * tpoint/gui.C:
+     - implemented comment lines
+     - changed layout of output
+
+
 
  2004/06/01 - Thomas Bretz
@@ -39 +54 @@
 
    * bending_magic.txt:
-     - last calculated pointing model (stil has the hysteresis 
+     - last calculated pointing model (still has the hysteresis 
        problem)
 

trunk/MagicSoft/Cosy/caos/Ring.cc

@@ -62 +62 @@
     fR = hypot(fX-leds(i).GetX(), fY-leds(i).GetY());
 
+    fMag = (leds(i).GetMag() + leds(j).GetMag() + leds(k).GetMag())/3;
+
     return kTRUE;
 }
@@ -77 +79 @@
     fDr=0;
 
+    fMag=0;
+
     if (n<1)
         return;
@@ -84 +88 @@
         const Ring &ring = rings(i);
 
-        fX += ring.GetX();
-        fY += ring.GetY();
-        fR += ring.GetR();
+        fX +  = ring.GetX();
+        fY   += ring.GetY();
+        fR   += ring.GetR();
+        fMag += ring.GetMag();
     }
 
-    fX /= n;
-    fY /= n;
-    fR /= n;
+    fX   /= n;
+    fY   /= n;
+    fR   /= n;
+    fMag /= n;
 
     if (n<2)

trunk/MagicSoft/Cosy/caos/Ring.h

@@ -22 +22 @@
     Double_t fDphi;
 
+    Double_t fMag;
+
     Double_t sqr(Double_t x) { return x*x; }
 
@@ -39 +41 @@
     Double_t GetPhi() const { return fPhi; }
 
+    Double_t GetMag() const { return fMag; }
+
     bool CalcCenter(const Leds &leds, Int_t i, Int_t j, Int_t k);
     void InterpolCenters(const Rings &rings);

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -904 +904 @@
     // Check wheter star found
     Led *star = (Led*)leds.At(0);
-    if (!star)
+    if (!star || leds.GetEntries()<1)
         return;
 
@@ -993 +993 @@
     *fOutTp << " " << -dzd << " " << -daz;
     *fOutTp << " " << setprecision(11) << t.GetMjd();
+    *fOutTp << " " << setprecision(4) << center.GetMag();
+    *fOutTp << " " << star->GetMag();
     *fOutTp << endl;
 

trunk/MagicSoft/Cosy/tpoint/gui.C

@@ -142 +142 @@
 {
     TString str;
-    str.ReadLine(fin);
+    do
+    {
+        str.ReadLine(fin);
+        if (!fin)
+            return fin;
+    } while (str[0]=='#');
 
     Float_t v[4];
@@ -577 +582 @@
         gdaz.SetMinimum(-absmax1);
         gdzd.SetMinimum(-absmax2);
+        graz.SetMinimum(0);
+        grzd.SetMinimum(0);
 
         c1=new TCanvas("CanvGraphs", "Graphs");
@@ -583 +590 @@
         TLine line;
         line.SetLineColor(kGreen);
+        line.SetLineWidth(2);
 
         c1->cd(1);
@@ -660 +668 @@
         cout << "Total Spread of Residual:" << endl;
         cout << "-------------------------" << endl;
-        cout << "before: " << hres1.GetMean() << " \xb1 " << hres1.GetRMS() << " deg " << endl;
-        cout << "after:  " << hres2.GetMean() << " \xb1 " << hres2.GetRMS() << " deg " << endl;
+        cout << "before: " << Form("%6.4f", hres1.GetMean()) << " \xb1 " << Form("%6.4f", hres1.GetRMS()) << " deg \t";
+        cout << "before: " << Form("%4.1f", hres1.GetMean()*60) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60) << " arcmin" << endl;
+        cout << "after:  " << Form("%6.4f", hres2.GetMean()) << " \xb1 " << Form("%6.4f", hres2.GetRMS()) << " deg \t";
+        cout << "after:  " << Form("%4.1f", hres2.GetMean()*60) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60) << " arcmin" << endl;
+        cout << "backw:  " << Form("%6.4f", hres3.GetMean()) << " \xb1 " << Form("%6.4f", hres3.GetRMS()) << " deg \t";
+        cout << "backw:  " << Form("%4.1f", hres3.GetMean()*60) << " \xb1 " << Form("%.1f", hres3.GetRMS()*60) << " arcmin" << endl;
         cout << endl;
-        cout << "before: " << Form("%.1f", hres1.GetMean()*60) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60) << " arcmin" << endl;
-        cout << "after:  " << Form("%.1f", hres2.GetMean()*60) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60) << " arcmin" << endl;
+        cout << "before: " << Form("%4.1f", hres1.GetMean()*16348/360) << " \xb1 " << Form("%.1f", hres1.GetRMS()*16384/360) << " SE \t\t";
+        cout << "before: " << Form("%4.1f", hres1.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60*60/23.4) << " pix" << endl;
+        cout << "after:  " << Form("%4.1f", hres2.GetMean()*16384/360) << " \xb1 " << Form("%.1f", hres2.GetRMS()*16384/360) << " SE \t\t";
+        cout << "after:  " << Form("%4.1f", hres2.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60*60/23.4) << " pix" << endl;
+        cout << "backw:  " << Form("%4.1f", hres3.GetMean()*16384/360) << " \xb1 " << Form("%.1f", hres3.GetRMS()*16384/360) << " SE \t\t";
+        cout << "backw:  " << Form("%4.1f", hres3.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres3.GetRMS()*60*60/23.4) << " pix" << endl;
         cout << endl;
-        cout << "before: " << Form("%.1f", hres1.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60*60/23.4) << " pix" << endl;
-        cout << "after:  " << Form("%.1f", hres2.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60*60/23.4) << " pix" << endl;
-        cout << "after:  " << Form("%.1f", hres2.GetMean()*16384/360) << " \xb1 " << Form("%.1f", hres2.GetRMS()*16384/360) << " SE" << endl;
-        cout << endl;
-        cout << "backw:  " << Form("%.1f", hres3.GetMean()*60) << " \xb1 " << Form("%.1f", hres3.GetRMS()*60) << " arcmin" << endl;
-        cout << endl;                                            // ±
+        cout << endl; // ±
     
 
@@ -870 +881 @@
     {
         TGLabel *l1 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+1);
-        l1->SetText(Form("Before: %.1f +- %.1f SE", before));
+        l1->SetText(Form("Before: %.1f +- %.1f SE", before, 0));
 
         TGLabel *l2 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+2);
-        l2->SetText(Form("After:  %.1f +- %.1f SE", after));
+        l2->SetText(Form("After:  %.1f +- %.1f SE", after, 0));
 
         TGLabel *l3 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+3);
-        l3->SetText(Form("Backw:  %.1f +- %.1f SE", backw));
+        l3->SetText(Form("Backw:  %.1f +- %.1f SE", backw, 0));
     }
 
@@ -885 +896 @@
             gVirtualX->DeleteFont(fFont);
     }
-    MFit() : TGMainFrame(gClient->GetRoot(), 740, 370, kHorizontalFrame)
+    MFit() : TGMainFrame(gClient->GetRoot(), 750, 370, kHorizontalFrame)
     {
         fCoordinates.SetOwner();