Changeset 4255 for trunk/MagicSoft/Cosy/main
- Timestamp:
- 06/01/04 16:48:19 (20 years ago)
- Location:
- trunk/MagicSoft/Cosy/main
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Cosy/main/MBending.cc
r4105 r4255 118 118 fDescr[15] = "Alt/Az Coude Displacement (N-S)"; 119 119 fDescr[16] = "Alt/Az Coude Displacement (E-W)"; 120 fDescr[17] = "n/a ";120 fDescr[17] = "n/a <ZA Hysteresis>"; 121 121 fDescr[18] = "n/a"; 122 122 } … … 204 204 val *= kDeg2Rad; 205 205 206 Double_t *dest=NULL; 207 208 if (str=="IA") dest = &fIa; 209 if (str=="IE") dest = &fIe; 210 if (str=="FLOP") dest = &fFlop; 211 if (str=="NPAE") dest = &fNpae; 212 if (str=="CA") dest = &fCa; 213 if (str=="AN") dest = &fAn; 214 if (str=="AW") dest = &fAw; 215 if (str=="TF") dest = &fTf; 216 if (str=="TX") dest = &fTx; 217 if (str=="NRX") dest = &fNrx; 218 if (str=="NRY") dest = &fNry; 219 if (str=="CRX") dest = &fCrx; 220 if (str=="CRY") dest = &fCry; 221 if (str=="ECES") dest = &fEces; 222 if (str=="ACES") dest = &fAces; 223 if (str=="ECEC") dest = &fEcec; 224 if (str=="ACEC") dest = &fAcec; 225 226 if (dest) 227 *dest = val; 206 // Find parameter 207 Int_t n = -1; 208 for (int i=0; i<fNumPar; i++) 209 if (str==fName[i]) 210 { 211 n = i; 212 *fCoeff[i] = val; 213 break; 214 } 228 215 229 216 fin >> val; 230 217 cout << setw(9) << val << "°" << endl; 231 218 232 // Find corresponding error 233 for (int i=0; i<MBending::GetNumPar(); i++) 234 if (dest==fCoeff[i]) 235 { 236 fError[i] = val*kDeg2Rad; 237 break; 238 } 219 // corresponding error 220 fError[n] = val*kDeg2Rad; 239 221 } 240 222 cout << endl; … … 490 472 p += FLOP; 491 473 492 //const AltAz MAGIC1(fMagic1*sin(p.Az()), 0);493 //p += MAGIC1;474 const AltAz MAGIC1(fMagic1*TMath::Sign(1., sin(p.Az())), 0); 475 p += MAGIC1; 494 476 495 477 const AltAz I(fIe, fIa); … … 512 494 const AltAz I(fIe, fIa); 513 495 p -= I; 496 497 const AltAz MAGIC1(fMagic1*TMath::Sign(1., sin(p.Az())), 0); 498 p -= MAGIC1; 514 499 515 500 //const AltAz MAGIC1(fMagic1*sin(p.Az()), 0); … … 622 607 } 623 608 624 void MBending::SetMinuitParameters(TMinuit &m, Int_t n =-1) const609 void MBending::SetMinuitParameters(TMinuit &m, Int_t n) const 625 610 { 626 611 if (n<0) … … 633 618 } 634 619 635 void MBending::GetMinuitParameters(TMinuit &m, Int_t n =-1)620 void MBending::GetMinuitParameters(TMinuit &m, Int_t n) 636 621 { 637 622 if (n<0 || n>m.GetNumPars()) … … 665 650 } 666 651 */ 667 void MBending::PrintMinuitParameters(TMinuit &m, Int_t n =-1) const652 void MBending::PrintMinuitParameters(TMinuit &m, Int_t n) const 668 653 { 669 654 if (n<0) -
trunk/MagicSoft/Cosy/main/MCosy.cc
r4153 r4255 1447 1447 cout << "Open Repfile: " << name << endl; 1448 1448 fOutRep = new MLog(name, kTRUE); 1449 *fOutRep << "[Drive Report File]" << endl; 1450 *fOutRep << "Version <cvs>" << endl; 1451 *fOutRep << "Date " << MTime(-1) << endl; 1452 *fOutRep << "[Reports]" << endl; 1449 1453 1450 1454 /* -
trunk/MagicSoft/Cosy/main/MCosy.h
r4154 r4255 201 201 } 202 202 203 MLog *GetOutRep() { return fOutRep; } 204 203 205 // static ZdAz CorrectTarget(const ZdAz &src, const ZdAz &dst); 204 206 // static ZdAz RaDec2ZdAz(const double mjd, const RaDec &pos, const RaDec &pm=RaDec(0,0)); -
trunk/MagicSoft/Cosy/main/MStarguider.cc
r4154 r4255 922 922 // Get tracking coordinates 923 923 const XY xy = fCRaDec->GetCoordinates(); 924 const RaDec rd(xy.X()*TMath::DegToRad()* 360/24, xy.Y()*TMath::DegToRad());924 const RaDec rd(xy.X()*TMath::DegToRad()*15, xy.Y()*TMath::DegToRad()); 925 925 926 926 ac.SetRaDec(rd.Ra(), rd.Dec()); 927 927 928 // Adapt coordinate system (GUI and humans are counting Y in different directions)928 // Adapt coordinate system (GUIs and humans are counting Y in different directions) 929 929 Double_t x = star->GetX()-center.GetX(); 930 930 Double_t y = center.GetY()-star->GetY(); 931 932 cout << "STAR-Offset: " << MTime(-1) << " dx=" << x << "pix dy=" << dy << "pix" << endl; 931 933 932 934 // Convert from Pixel to millimeter (1pix=2.9mm) … … 993 995 *fOutTp << " " << setprecision(11) << t.GetMjd(); 994 996 *fOutTp << endl; 997 998 MLog &outrep = *fCosy->GetOutRep(); 999 if (outrep.Lock("MStarguider::FindStar")) 1000 { 1001 outrep << "FINDSTAR-REPORT " << MTime(-1) << " " << setprecision(7); 1002 outrep << 90-za0.Alt() << " " << za0.Az() << " "; 1003 outrep << za1.Zd() << " " << za1.Az() << " "; 1004 outrep << xy.X() << " " << xy.Y() << " "; 1005 outrep << -dzd << " " << -daz << " "; 1006 outrep << star->GetX() << " " << star->GetY() << " "; 1007 outrep << center.GetX() << " " << center.GetY() << " "; 1008 outrep << x*1.0713/2.58427 << " " << y*1.0713/2.58427 << " " << star->GetMag(); 1009 outrep << setprecision(11) << t.GetMjd() << endl; 1010 outrep.UnLock("MStarguider::FindStar") 1011 } 995 1012 } 996 1013
Note:
See TracChangeset
for help on using the changeset viewer.