Changeset 7104 for trunk/MagicSoft/Cosy

Timestamp:

05/30/05 10:31:23 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• mag.C (deleted)
• plot.C (deleted)
• tpoint/gui.C (modified) (19 diffs)
• tpoint/mag.C (added)
• tpoint/plot.C (added)
• tpoint/tpoint0404.txt (added)
• tpoint/tpoint0405.txt (added)
• tpoint/tpoint0408-1.txt (added)
• tpoint/tpoint0408-2.txt (added)
• tpoint/tpoint0409.txt (added)
• tpoint/tpoint0410.txt (added)
• tpoint/tpoint0411.txt (added)
• tpoint/tpoint0412.txt (added)
• tpoint/tpoint0503.txt (added)
• tpoint/tpoint0504.txt (added)
• tpoint/tpoint0505-1.txt (added)
• tpoint/tpoint0505-2.txt (added)
• tpoint0404.txt (deleted)
• tpoint0405.txt (deleted)
• tpoint0408-2.txt (deleted)
• tpoint0408.txt (deleted)
• tpoint0409.txt (deleted)
• tpoint0410.txt (deleted)
• tpoint0411.txt (deleted)
• tpoint0412.txt (deleted)
• tpoint0503.txt (deleted)
• tpoint0504.txt (deleted)

trunk/MagicSoft/Cosy/tpoint/gui.C

@@ -1 @@
-#include <fstream.h>
-#include <fstream.h>
-#include <fstream.h>
-#include <iostream.h>
-#include <iomanip.h>
+#include <fstream>
+#include <iostream>
+#include <iomanip>
 
 #include <TError.h>
@@ -26 +24 @@
 #include <TCanvas.h>
 
-#include "coord.h"
+//#include "coord.h"
 
 #include "MGList.h"
-#include "MBending.h"
+#include "MPointing.h"
+
+using namespace std;
 
 class Set : public TObject
@@ -126 +126 @@
     void AdjustAz(Double_t daz) { fStarAz += daz*TMath::DegToRad(); }
 
-    void Adjust(const MBending &bend)
+    void Adjust(const MPointing &bend)
     {
         AltAz p = bend(GetStarAltAz());
@@ -132 +132 @@
         fStarAz = p.Az();
     }
-    void AdjustBack(const MBending &bend)
+    void AdjustBack(const MPointing &bend)
     {
         AltAz p = bend.CorrectBack(GetRawAltAz());
@@ -182 +182 @@
 private:
     enum {
-        kTbFit = 19, //MBending::GetNumPar(), // FIXME!!!
+        kTbFit = 19, //MPointing::GetNumPar(), // FIXME!!!
         kTbLoad,
         kTbSave,
@@ -196 +196 @@
     TList fLabel;
 
-    MBending fBending;
+    MPointing fBending;
 
     FontStruct_t fFont;
@@ -204 +204 @@
         f = 0;
 
-        MBending bend;
-        bend.SetParameters(par); // Set Parameters [deg] to MBending
+        MPointing bend;
+        bend.SetParameters(par); // Set Parameters [deg] to MPointing
 
         for (int i=0; i<fCoordinates.GetSize(); i++)
@@ -430 +430 @@
         grmag.SetTitle(" \\Delta vs. Mag ");
     
-        TMinuit minuit(MBending::GetNumPar());  //initialize TMinuit with a maximum of 5 params
+        TMinuit minuit(MPointing::GetNumPar());  //initialize TMinuit with a maximum of 5 params
         minuit.SetObjectFit(this);
         minuit.SetPrintLevel(-1);
         minuit.SetFCN(fcn);
     
-        fBending.SetMinuitParameters(minuit, MBending::GetNumPar()); // Init Parameters [deg]
-    
-        for (int i=0; i<MBending::GetNumPar(); i++)
+        fBending.SetMinuitParameters(minuit, MPointing::GetNumPar()); // Init Parameters [deg]
+    
+        for (int i=0; i<MPointing::GetNumPar(); i++)
         {
             TGButton *l = (TGButton*)fList->FindWidget(i);
@@ -482 +482 @@
         TArrayD par;
         fBending.GetParameters(par);
-        for (int i=2; i<MBending::GetNumPar(); i++)
+        for (int i=2; i<MPointing::GetNumPar(); i++)
             par[i]=0;
     
-        MBending b2;
+        MPointing b2;
         b2.SetParameters(par);
     
@@ -495 +495 @@
             Set &set0 = *(Set*)fCoordinates.At(i);
     
-            ZdAz za = set0.GetStarZdAz()*kRad2Deg;
+            ZdAz za(set0.GetStarZdAz());
+            za *=kRad2Deg;
     
             //
@@ -615 +616 @@
 
         c1=new TCanvas("CanvGraphs", "Graphs");
-        c1->Divide(3,3,0,0);
+        c1->Divide(3,3,1e-10,1e-10);
 
         TLine line;
@@ -755 +756 @@
 
         c1=new TCanvas("CanvResiduals", "Residuals", 800, 800);
-        c1->Divide(2, 2, 0, 0);
+        c1->Divide(2, 2, 1e-10, 1e-10);
     
         c1->cd(2);
@@ -952 +953 @@
         TGLabel *l;
 
-        for (int i=0; i<MBending::GetNumPar(); i++)
+        for (int i=0; i<MPointing::GetNumPar(); i++)
         {
             l = (TGLabel*)fLabel.At(i);
             l->SetText(Form("%.4f\xb0", par[i]));
 
-            l = (TGLabel*)fLabel.At(MBending::GetNumPar()+i);
+            l = (TGLabel*)fLabel.At(MPointing::GetNumPar()+i);
             l->SetText(Form("\xb1 %8.4f\xb0", err[i]));
         }
@@ -964 +965 @@
     void DisplayData()
     {
-        TGLabel *l = (TGLabel*)fLabel.At(3*MBending::GetNumPar());
+        TGLabel *l = (TGLabel*)fLabel.At(3*MPointing::GetNumPar());
         l->SetText(Form("%d data sets loaded.", fOriginal.GetSize()));
     }
@@ -970 +971 @@
     void DisplayResult(Double_t before, Double_t after, Double_t backw)
     {
-        TGLabel *l1 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+1);
+        TGLabel *l1 = (TGLabel*)fLabel.At(3*MPointing::GetNumPar()+1);
         l1->SetText(Form("Before: %.1f +- %.1f SE", before, 0));
 
-        TGLabel *l2 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+2);
+        TGLabel *l2 = (TGLabel*)fLabel.At(3*MPointing::GetNumPar()+2);
         l2->SetText(Form("After:  %.1f +- %.1f SE", after, 0));
 
-        TGLabel *l3 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+3);
+        TGLabel *l3 = (TGLabel*)fLabel.At(3*MPointing::GetNumPar()+3);
         l3->SetText(Form("Backw:  %.1f +- %.1f SE", backw, 0));
     }
@@ -1038 +1039 @@
         fList->Add(vframe);
 
-        for (int i=0; i<MBending::GetNumPar(); i++)
-            AddCheckButton(vframe, fBending.GetName(i), i);
+        for (int i=0; i<MPointing::GetNumPar(); i++)
+            AddCheckButton(vframe, fBending.GetVarName(i), i);
 
         vframe = new TGVerticalFrame(comp, 1, 1);
@@ -1057 +1058 @@
         vframe->AddFrame(l,h);
 
-        for (int i=1; i<MBending::GetNumPar(); i++)
+        for (int i=1; i<MPointing::GetNumPar(); i++)
             AddLabel(vframe, "+000.0000", h)->SetTextJustify(kTextRight);
 
@@ -1064 +1065 @@
         fList->Add(vframe);
 
-        for (int i=0; i<MBending::GetNumPar(); i++)
+        for (int i=0; i<MPointing::GetNumPar(); i++)
             AddLabel(vframe, "\xb1 00.0000\xb0", h)->SetTextJustify(kTextRight);
 
@@ -1071 +1072 @@
         fList->Add(vframe);
 
-        for (int i=0; i<MBending::GetNumPar(); i++)
+        for (int i=0; i<MPointing::GetNumPar(); i++)
             AddLabel(vframe, fBending.GetDescription(i), h);