Changeset 7313 for trunk/MagicSoft/Cosy

Timestamp:

08/25/05 13:57:36 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• candrv/nodedrv.cc (modified) (1 diff)
• main/MTracking.cc (modified) (2 diffs)
• tpoint/gui.C (modified) (15 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2005/08/22 - Thomas Bretz
+
+   * candrv/nodedrv.cc, main/MTracking.cc:
+     - fixed usage of MTime (MTime(-1) instead of MTime())
+
+
 
  2005/08/22 - Thomas Bretz

trunk/MagicSoft/Cosy/candrv/nodedrv.cc

@@ -422 +422 @@
         return true;
 
-    lout << " + " << GetNodeName() << ": NodeDrv::WaitForSdo: 0x" << hex << idx << "/" << dec << (int)subidx << " --> ZOMBIE! " << MTime() << endl;
+    lout << " + " << GetNodeName() << ": NodeDrv::WaitForSdo: 0x" << hex << idx << "/" << dec << (int)subidx << " --> ZOMBIE! " << MTime(-1) << endl;
     if (zombie)
         SetZombie();

trunk/MagicSoft/Cosy/main/MTracking.cc

@@ -548 +548 @@
         return (void*)3;
 
-    lout << "- Tracking Thread started (" << MTime() << ")" << endl;
+    lout << "- Tracking Thread started (" << MTime(-1) << ")" << endl;
 
     //const XY re2se = fCosy->kGearTot/fCosy->kResSE; //[re/se]
@@ -635 +635 @@
     }
 
-    lout << "- Tracking Thread done. (" << MTime() << ")" << endl;
+    lout << "- Tracking Thread done. (" << MTime(-1) << ")" << endl;
     return 0;
 }

trunk/MagicSoft/Cosy/tpoint/gui.C

@@ -65 +65 @@
         const Double_t del = fRawEl-fStarEl;
         const Double_t daz = fRawAz-fStarAz;
+
         /*
         const Double_t dphi2 = daz/2.;
@@ -71 +72 @@
         const Double_t d = cos(del)*cos2 - cos(fRawEl+fStarEl)*sin2;
         */
-
         const Double_t d  = cos(del) - cos(fRawEl)*cos(fStarEl)*(1.-cos(daz));
 
@@ -208 +208 @@
         bend.SetParameters(par); // Set Parameters [deg] to MPointing
 
+        Int_t n=0;
         for (int i=0; i<fCoordinates.GetSize(); i++)
         {
@@ -214 +215 @@
             set.Adjust(bend);
 
-            Double_t err;// = 0.005; // [deg] = 0.25SE
-            Double_t res = set.GetResidual(&err);
+            Double_t err = 0.01; // [deg] = 0.25SE
+            Double_t res = set.GetResidual(); //(&err);
             res /= err;
 
@@ -221 +222 @@
         }
 
-        //f /= (fCoordinates.GetSize()-7)*(fCoordinates.GetSize()-7);
-        //f /= fCoordinates.GetSize()*fCoordinates.GetSize();
-        //cout << f << ": " << fCoordinates.GetSize() << endl;
         f /= fCoordinates.GetSize();
     }
@@ -256 +254 @@
         //Double_t x1[3] = { r1*cos(phi1), r1*sin(phi1), 0};
 
-        Double_t y0[3], y1[3];
+        Double_t y0[3];//, y1[3];
     
         view->WCtoNDC(x0, y0);
@@ -412 +410 @@
         TGraph gaz;
         TGraph gzd;
-        TGraph graz;
-        TGraph grzd;
-        TGraph grmag;
+        TGraphErrors graz;
+        TGraphErrors grzd;
+        TGraphErrors grmag;
         TGraph gmaz;
         TGraph gmzd;
@@ -513 +511 @@
             if (dz>180)
                 dz -= 360;
+
+            Double_t err;
     
             gdzd.SetPoint(i, za.Az(), set0.GetDZd());
             gdaz.SetPoint(i, za.Zd(), dz);
-            graz.SetPoint(i, za.Az(), set0.GetResidual());
-            grzd.SetPoint(i, za.Zd(), set0.GetResidual());
+            graz.SetPoint(i, za.Az(), set0.GetResidual(&err));
+            graz.SetPointError(i, 0, err);
+            grzd.SetPoint(i, za.Zd(), set0.GetResidual(&err));
+            grzd.SetPointError(i, 0, err);
             gaz.SetPoint( i, za.Az(), dz);
             gzd.SetPoint( i, za.Zd(), set0.GetDZd());
             if (set0.GetMag()>=-20)
             {
-                grmag.SetPoint(i, set0.GetMag(), set0.GetResidual());
+                grmag.SetPoint(i, set0.GetMag(), set0.GetResidual(&err));
+                grmag.SetPointError(i, 0, err);
                 gmaz.SetPoint( i, set0.GetMag(), dz);
                 gmzd.SetPoint( i, set0.GetMag(), set0.GetDZd());
@@ -575 +578 @@
         cout << "OK." << endl;
         cout << endl;
-    
-
-        TCanvas *c1;
-
-        if ((c1 = (TCanvas*)gROOT->FindObject("CanvGraphs")))
-            delete c1;
-        if ((c1 = (TCanvas*)gROOT->FindObject("CanvResiduals")))
-            delete c1;
-
 
         const Double_t max1 = TMath::Max(gaz.GetHistogram()->GetMaximum(), gdaz.GetHistogram()->GetMaximum());
@@ -616 +610 @@
         grmag.SetMinimum(0);
 
-        c1=new TCanvas("CanvGraphs", "Graphs");
+        TCanvas *c1;
+
+        if (gROOT->FindObject("CanvGraphs"))
+            c1 = dynamic_cast<TCanvas*>(gROOT->FindObject("CanvGraphs"));
+        else
+            c1=new TCanvas("CanvGraphs", "Graphs");
+
+        gROOT->SetSelectedPad(0);
+        c1->SetSelectedPad(0);
+        c1->Clear();
+
         c1->SetFillColor(kWhite);
         c1->Divide(3,3,1e-10,1e-10);
@@ -698 +702 @@
         gPad->SetGridx();
         gPad->SetGridy();
-        g=(TGraph*)graz.DrawClone("A*");
+        g=(TGraph*)graz.DrawClone("AP");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Az [\\circ]");
@@ -708 +712 @@
         gPad->SetGridx();
         gPad->SetGridy();
-        g=(TGraph*)grzd.DrawClone("A*");
+        g=(TGraph*)grzd.DrawClone("AP");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Zd [\\circ]");
@@ -718 +722 @@
         gPad->SetGridx();
         gPad->SetGridy();
-        g=(TGraph*)grmag.DrawClone("A*");
+        g=(TGraph*)grmag.DrawClone("AP");
         g->SetBit(kCanDelete);
         g->GetHistogram()->SetXTitle("Mag");
@@ -757 +761 @@
         gStyle->SetStatFormat("6.2g");
 
-
-        c1=new TCanvas("CanvResiduals", "Residuals", 800, 800);
+        if (gROOT->FindObject("CanvResiduals"))
+            c1 = dynamic_cast<TCanvas*>(gROOT->FindObject("CanvResiduals"));
+        else
+            c1=new TCanvas("CanvResiduals", "Residuals", 800, 800);
+
+        gROOT->SetSelectedPad(0);
+        c1->SetSelectedPad(0);
+        c1->Clear();
+
         c1->Divide(2, 2, 1e-10, 1e-10);
     
@@ -866 +877 @@
         };
 
-        static TString dir(".");
+        static TString dir("tpoint/");
 
         TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo