Changeset 4357


Ignore:
Timestamp:
06/28/04 14:21:08 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Cosy/Changelog

    r4255 r4357  
    11                                                                  -*-*- END -*-*-
     2
     3 2004/06/28 - Thomas Bretz
     4
     5   * caos/Ring.[h,cc]:
     6     - added magnitude fMag
     7     - added interpolation of magnitude
     8
     9   * main/MStarguider.cc:
     10     - added output of magnitudes
     11
     12   * tpoint/gui.C:
     13     - implemented comment lines
     14     - changed layout of output
     15
     16
    217
    318 2004/06/01 - Thomas Bretz
     
    3954
    4055   * bending_magic.txt:
    41      - last calculated pointing model (stil has the hysteresis
     56     - last calculated pointing model (still has the hysteresis
    4257       problem)
    4358
  • trunk/MagicSoft/Cosy/caos/Ring.cc

    r4107 r4357  
    6262    fR = hypot(fX-leds(i).GetX(), fY-leds(i).GetY());
    6363
     64    fMag = (leds(i).GetMag() + leds(j).GetMag() + leds(k).GetMag())/3;
     65
    6466    return kTRUE;
    6567}
     
    7779    fDr=0;
    7880
     81    fMag=0;
     82
    7983    if (n<1)
    8084        return;
     
    8488        const Ring &ring = rings(i);
    8589
    86         fX += ring.GetX();
    87         fY += ring.GetY();
    88         fR += ring.GetR();
     90        fX +  = ring.GetX();
     91        fY   += ring.GetY();
     92        fR   += ring.GetR();
     93        fMag += ring.GetMag();
    8994    }
    9095
    91     fX /= n;
    92     fY /= n;
    93     fR /= n;
     96    fX   /= n;
     97    fY   /= n;
     98    fR   /= n;
     99    fMag /= n;
    94100
    95101    if (n<2)
  • trunk/MagicSoft/Cosy/caos/Ring.h

    r4107 r4357  
    2222    Double_t fDphi;
    2323
     24    Double_t fMag;
     25
    2426    Double_t sqr(Double_t x) { return x*x; }
    2527
     
    3941    Double_t GetPhi() const { return fPhi; }
    4042
     43    Double_t GetMag() const { return fMag; }
     44
    4145    bool CalcCenter(const Leds &leds, Int_t i, Int_t j, Int_t k);
    4246    void InterpolCenters(const Rings &rings);
  • trunk/MagicSoft/Cosy/main/MStarguider.cc

    r4256 r4357  
    904904    // Check wheter star found
    905905    Led *star = (Led*)leds.At(0);
    906     if (!star)
     906    if (!star || leds.GetEntries()<1)
    907907        return;
    908908
     
    993993    *fOutTp << " " << -dzd << " " << -daz;
    994994    *fOutTp << " " << setprecision(11) << t.GetMjd();
     995    *fOutTp << " " << setprecision(4) << center.GetMag();
     996    *fOutTp << " " << star->GetMag();
    995997    *fOutTp << endl;
    996998
  • trunk/MagicSoft/Cosy/tpoint/gui.C

    r4256 r4357  
    142142{
    143143    TString str;
    144     str.ReadLine(fin);
     144    do
     145    {
     146        str.ReadLine(fin);
     147        if (!fin)
     148            return fin;
     149    } while (str[0]=='#');
    145150
    146151    Float_t v[4];
     
    577582        gdaz.SetMinimum(-absmax1);
    578583        gdzd.SetMinimum(-absmax2);
     584        graz.SetMinimum(0);
     585        grzd.SetMinimum(0);
    579586
    580587        c1=new TCanvas("CanvGraphs", "Graphs");
     
    583590        TLine line;
    584591        line.SetLineColor(kGreen);
     592        line.SetLineWidth(2);
    585593
    586594        c1->cd(1);
     
    660668        cout << "Total Spread of Residual:" << endl;
    661669        cout << "-------------------------" << endl;
    662         cout << "before: " << hres1.GetMean() << " \xb1 " << hres1.GetRMS() << " deg " << endl;
    663         cout << "after:  " << hres2.GetMean() << " \xb1 " << hres2.GetRMS() << " deg " << endl;
     670        cout << "before: " << Form("%6.4f", hres1.GetMean()) << " \xb1 " << Form("%6.4f", hres1.GetRMS()) << " deg \t";
     671        cout << "before: " << Form("%4.1f", hres1.GetMean()*60) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60) << " arcmin" << endl;
     672        cout << "after:  " << Form("%6.4f", hres2.GetMean()) << " \xb1 " << Form("%6.4f", hres2.GetRMS()) << " deg \t";
     673        cout << "after:  " << Form("%4.1f", hres2.GetMean()*60) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60) << " arcmin" << endl;
     674        cout << "backw:  " << Form("%6.4f", hres3.GetMean()) << " \xb1 " << Form("%6.4f", hres3.GetRMS()) << " deg \t";
     675        cout << "backw:  " << Form("%4.1f", hres3.GetMean()*60) << " \xb1 " << Form("%.1f", hres3.GetRMS()*60) << " arcmin" << endl;
    664676        cout << endl;
    665         cout << "before: " << Form("%.1f", hres1.GetMean()*60) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60) << " arcmin" << endl;
    666         cout << "after:  " << Form("%.1f", hres2.GetMean()*60) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60) << " arcmin" << endl;
     677        cout << "before: " << Form("%4.1f", hres1.GetMean()*16348/360) << " \xb1 " << Form("%.1f", hres1.GetRMS()*16384/360) << " SE \t\t";
     678        cout << "before: " << Form("%4.1f", hres1.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60*60/23.4) << " pix" << endl;
     679        cout << "after:  " << Form("%4.1f", hres2.GetMean()*16384/360) << " \xb1 " << Form("%.1f", hres2.GetRMS()*16384/360) << " SE \t\t";
     680        cout << "after:  " << Form("%4.1f", hres2.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60*60/23.4) << " pix" << endl;
     681        cout << "backw:  " << Form("%4.1f", hres3.GetMean()*16384/360) << " \xb1 " << Form("%.1f", hres3.GetRMS()*16384/360) << " SE \t\t";
     682        cout << "backw:  " << Form("%4.1f", hres3.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres3.GetRMS()*60*60/23.4) << " pix" << endl;
    667683        cout << endl;
    668         cout << "before: " << Form("%.1f", hres1.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres1.GetRMS()*60*60/23.4) << " pix" << endl;
    669         cout << "after:  " << Form("%.1f", hres2.GetMean()*60*60/23.4) << " \xb1 " << Form("%.1f", hres2.GetRMS()*60*60/23.4) << " pix" << endl;
    670         cout << "after:  " << Form("%.1f", hres2.GetMean()*16384/360) << " \xb1 " << Form("%.1f", hres2.GetRMS()*16384/360) << " SE" << endl;
    671         cout << endl;
    672         cout << "backw:  " << Form("%.1f", hres3.GetMean()*60) << " \xb1 " << Form("%.1f", hres3.GetRMS()*60) << " arcmin" << endl;
    673         cout << endl;                                            // ±
     684        cout << endl; // ±
    674685   
    675686
     
    870881    {
    871882        TGLabel *l1 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+1);
    872         l1->SetText(Form("Before: %.1f +- %.1f SE", before));
     883        l1->SetText(Form("Before: %.1f +- %.1f SE", before, 0));
    873884
    874885        TGLabel *l2 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+2);
    875         l2->SetText(Form("After:  %.1f +- %.1f SE", after));
     886        l2->SetText(Form("After:  %.1f +- %.1f SE", after, 0));
    876887
    877888        TGLabel *l3 = (TGLabel*)fLabel.At(3*MBending::GetNumPar()+3);
    878         l3->SetText(Form("Backw:  %.1f +- %.1f SE", backw));
     889        l3->SetText(Form("Backw:  %.1f +- %.1f SE", backw, 0));
    879890    }
    880891
     
    885896            gVirtualX->DeleteFont(fFont);
    886897    }
    887     MFit() : TGMainFrame(gClient->GetRoot(), 740, 370, kHorizontalFrame)
     898    MFit() : TGMainFrame(gClient->GetRoot(), 750, 370, kHorizontalFrame)
    888899    {
    889900        fCoordinates.SetOwner();
Note: See TracChangeset for help on using the changeset viewer.