Changeset 4256 for trunk/MagicSoft

Timestamp:

06/01/04 16:52:40 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• main/MStarguider.cc (modified) (3 diffs)
• main/MTracking.cc (modified) (2 diffs)
• tcpip/MTcpIpIO.cc (modified) (1 diff)
• tpoint/gui.C (modified) (9 diffs)

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -914 +914 @@
     MGeomCamMagic geom;
     MAstroCamera ac;
-    ac.SetMirrors("magic.def");
     ac.SetGeom(geom);
     ac.SetRadiusFOV(3);
@@ -930 +929 @@
     Double_t y = center.GetY()-star->GetY();
 
-    cout << "STAR-Offset: " << MTime(-1) << " dx=" << x << "pix  dy=" << dy << "pix" << endl;
+    cout << "STAR-Offset: " << MTime(-1) << " dx=" << x << "pix  dy=" << y << "pix" << endl;
 
     // Convert from Pixel to millimeter (1pix=2.9mm)
@@ -1008 +1007 @@
         outrep << x*1.0713/2.58427 << " " << y*1.0713/2.58427 << " " << star->GetMag();
         outrep << setprecision(11) << t.GetMjd() << endl;
-        outrep.UnLock("MStarguider::FindStar")
+        outrep.UnLock("MStarguider::FindStar");
     }
 }

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -510 +510 @@
     sla.Now();
 
-    ZdAz time;
+    //ZdAz time;
 
     ZdAz soll = sla.CalcZdAz(fCosy->fRaDec); // [rad]
@@ -521 +521 @@
     bool phcaz=false;
 
-    ZdAz wasse = fCosy->GetSePos();
-    ZdAz oldse = fCosy->GetSePos();
+    //ZdAz wasse = fCosy->GetSePos();
+    //ZdAz oldse = fCosy->GetSePos();
 
     while (!HasStopFlag())

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -76 +76 @@
     if (lout.Lock("MTcpIpIO::Send"))
     {
-        const Int_t rc = lout.IsOutputDeviceEnabled(MLog::eGui);
-        lout.DisableOutputDevice(MLog::eGui);
+        //const Int_t rc = lout.IsOutputDeviceEnabled(MLog::eGui);
+        //lout.DisableOutputDevice(MLog::eGui);
         lout << msg << flush;
         lout.UnLock("MTcpIpIO::Send");
-        if (rc)
-            lout.EnableOutputDevice(MLog::eGui);
+        //if (rc)
+        //    lout.EnableOutputDevice(MLog::eGui);
     }
 

trunk/MagicSoft/Cosy/tpoint/gui.C

@@ -14 +14 @@
 #include <TH1.h>
 #include <TH2.h>
-#include <TGraph.h>
+#include <TGraphErrors.h>
 
 #include <TList.h>
@@ -496 +496 @@
             gaz.SetPoint( i, za.Az(), dz);
             gzd.SetPoint( i, za.Zd(), set0.GetDZd());
-
         }
     
@@ -556 +555 @@
 
 
+        const Double_t max1 = TMath::Max(gaz.GetHistogram()->GetMaximum(), gdaz.GetHistogram()->GetMaximum());
+        const Double_t max2 = TMath::Max(gzd.GetHistogram()->GetMaximum(), gdzd.GetHistogram()->GetMaximum());
+        const Double_t max3 = TMath::Max(grzd.GetHistogram()->GetMaximum(), graz.GetHistogram()->GetMaximum());
+
+        const Double_t min1 = TMath::Min(gaz.GetHistogram()->GetMinimum(), gdaz.GetHistogram()->GetMinimum());
+        const Double_t min2 = TMath::Min(gzd.GetHistogram()->GetMinimum(), gdzd.GetHistogram()->GetMinimum());
+        const Double_t min3 = TMath::Min(grzd.GetHistogram()->GetMinimum(), graz.GetHistogram()->GetMinimum());
+
+        const Double_t absmax1 = TMath::Max(max1, TMath::Abs(min1));
+        const Double_t absmax2 = TMath::Max(max2, TMath::Abs(min2));
+        const Double_t absmax3 = TMath::Max(max3, TMath::Abs(min3));
+
+        gaz.SetMaximum(absmax1);
+        gzd.SetMaximum(absmax2);
+        gdaz.SetMaximum(absmax1);
+        gdzd.SetMaximum(absmax2);
+        graz.SetMaximum(absmax3);
+        grzd.SetMaximum(absmax3);
+        gaz.SetMinimum(-absmax1);
+        gzd.SetMinimum(-absmax2);
+        gdaz.SetMinimum(-absmax1);
+        gdzd.SetMinimum(-absmax2);
 
         c1=new TCanvas("CanvGraphs", "Graphs");
         c1->Divide(2,3,0,0);
 
+        TLine line;
+        line.SetLineColor(kGreen);
+
         c1->cd(1);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         TGraph *g=(TGraph*)gaz.DrawClone("A*");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Az [\\circ]");
         g->GetHistogram()->SetYTitle("\\Delta Az [\\circ]");
-    
+        line.DrawLine(g->GetXaxis()->GetXmin(),  360./16384, g->GetXaxis()->GetXmax(),  360./16384);
+        line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384);
+
         c1->cd(2);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         g=(TGraph*)gdaz.DrawClone("A*");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Zd [\\circ]");
         g->GetHistogram()->SetYTitle("\\Delta Az [\\circ]");
+        line.DrawLine(g->GetXaxis()->GetXmin(),  360./16384, g->GetXaxis()->GetXmax(),  360./16384);
+        line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384);
         cout << "Mean dAz: " << g->GetMean(2) << " \xb1 " << g->GetRMS(2) <<  endl;
     
         c1->cd(3);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         g=(TGraph*)gdzd.DrawClone("A*");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Az [\\circ]");
         g->GetHistogram()->SetYTitle("\\Delta Zd [\\circ]");
+        line.DrawLine(g->GetXaxis()->GetXmin(),  360./16384, g->GetXaxis()->GetXmax(),  360./16384);
+        line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384);
         cout << "Mean dZd: " << g->GetMean(2) << " \xb1 " << g->GetRMS(2) <<  endl;
         cout << endl;
@@ -586 +622 @@
         c1->cd(4);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         g=(TGraph*)gzd.DrawClone("A*");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Zd [\\circ]");
         g->GetHistogram()->SetYTitle("\\Delta Zd [\\circ]");
+        line.DrawLine(g->GetXaxis()->GetXmin(),  360./16384, g->GetXaxis()->GetXmax(),  360./16384);
+        line.DrawLine(g->GetXaxis()->GetXmin(), -360./16384, g->GetXaxis()->GetXmax(), -360./16384);
 
         c1->cd(5);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         g=(TGraph*)graz.DrawClone("A*");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Az [\\circ]");
         g->GetHistogram()->SetYTitle("\\Delta [\\circ]");
+        line.DrawLine(g->GetXaxis()->GetXmin(),  360./16384, g->GetXaxis()->GetXmax(),  360./16384);
     
         c1->cd(6);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         g=(TGraph*)grzd.DrawClone("A*");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Zd [\\circ]");
         g->GetHistogram()->SetYTitle("\\Delta [\\circ]");
+        line.DrawLine(g->GetXaxis()->GetXmin(),  360./16384, g->GetXaxis()->GetXmax(),  360./16384);
 
 
@@ -644 +690 @@
         hres1.SetLineColor(kRed);
         hres1.DrawCopy();
+
+        line.DrawLine(360./16384, 0, 360./16384, hres1.GetMaximum());
     
         c1->cd(4);
@@ -656 +704 @@
         f.SetParameter(2, h->GetRMS());
         h->Fit("mygaus", "QR");
-        hres3.SetLineColor(kGreen);
+        hres3.SetLineColor(kCyan);
         hres3.SetLineStyle(kDashed);
         hres3.DrawCopy("same");
@@ -662 +710 @@
         cout << "Fit-Probability: " << f.GetProb()*100 << "%" << endl;
         cout << "      Chi^2/NDF: " << f.GetChisquare() << "/" << f.GetNDF() << " = " << f.GetChisquare()/f.GetNDF() << endl;
+        line.DrawLine(360./16384, 0, 360./16384, h->GetMaximum());
 
         c1->cd(1);
@@ -683 +732 @@
         gPad->Modified();
         gPad->Update();
-        for (int i=0; i<fCoordinates.GetSize(); i++)
-            DrawSet(gPad, *(Set*)fCoordinates.At(i), 10./hres2.GetMean(), par[0]);
+//        for (int i=0; i<fCoordinates.GetSize(); i++)
+//            DrawSet(gPad, *(Set*)fCoordinates.At(i), 10./hres2.GetMean(), par[0]);
 
         RaiseWindow();
@@ -976 +1025 @@
     gErrorIgnoreLevel = kError;
     new MFit;
+    // TF1 f1("f1", "[0]/cos((90-x)*3.1415/180)", 0, 90)
 }