Changeset 1806 for trunk/MagicSoft

Timestamp:

03/03/03 10:59:22 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• bending_magic.txt (added)
• main/MBending.cc (modified) (3 diffs)
• tpoint/tpointfit.C (modified) (1 diff)

trunk/MagicSoft/Cosy/main/MBending.cc

@@ -178 +178 @@
     p += CRY;
 
-    const AltAz NRX(fNrx*kDeg2Rad*sin(p.Alt()), -fNrx*kDeg2Rad);
-    const AltAz NRY(fNry*kDeg2Rad*cos(p.Alt()), -fNry*kDeg2Rad*tan(p.Alt()));
+    const AltAz NRX(fNrx*sin(p.Alt()), -fNrx);
+    const AltAz NRY(fNry*cos(p.Alt()), -fNry*tan(p.Alt()));
     p += NRX;
     p += NRY;
@@ -186 +186 @@
     p += MAGIC;
 
-    const AltAz AW( fAw*sin(p.Az()), -fAw*kDeg2Rad*cos(p.Az())*tan(p.Alt()));
+    const AltAz AW( fAw*sin(p.Az()), -fAw*cos(p.Az())*tan(p.Alt()));
     const AltAz AN(-fAn*cos(p.Az()), -fAn*sin(p.Az())*tan(p.Alt()));
     p += AW;
     p += AN;
 
-    //zd1 += 11.22;
-    //zd1 += 1.15*sin((az0+0.05)*3.1415/180);
+//    const AltAz MAGIC(-fMagic1*sin(p.Az()-fMagic2), 0);
+//    p += MAGIC;
+
 
     const AltAz CA(0, -fCa/cos(p.Alt()));
@@ -212 +213 @@
     AltAz p = aa;
 
-    const AltAz I(fIe/**kDeg2Rad*/, fIa/**kDeg2Rad*/);
+    const AltAz I(fIe, fIa);
     p -= I;
 
-    const AltAz NPAE(0, -fNpae*kDeg2Rad*tan(p.Alt()));
+    const AltAz NPAE(0, -fNpae*tan(p.Alt()));
     p -= NPAE;
 
-    const AltAz CA(0, -fCa*kDeg2Rad/cos(p.Alt()));
+    const AltAz CA(0, -fCa/cos(p.Alt()));
     p -= CA;
 
-    const AltAz AN(-fAn*kDeg2Rad*cos(p.Az()), -fAn*kDeg2Rad*sin(p.Az())*tan(p.Alt()));
-    const AltAz AW( fAw*kDeg2Rad*sin(p.Az()), 0/*-fAw*kDeg2Rad*cos(p.Az())*tan(p.Alt())*/);
+    const AltAz AN(-fAn*cos(p.Az()), -fAn*sin(p.Az())*tan(p.Alt()));
+    const AltAz AW( fAw*sin(p.Az()), -fAw*cos(p.Az())*tan(p.Alt()));
     p -= AN;
     p -= AW;
 
-    const AltAz NRY(fNry*kDeg2Rad*cos(p.Alt()), -fNry*kDeg2Rad*tan(p.Alt()));
-    const AltAz NRX(fNrx*kDeg2Rad*sin(p.Alt()), -fNrx*kDeg2Rad);
+    const AltAz MAGIC(-fMagic1*sin(p.Az()-fMagic2), 0);
+    p -= MAGIC;
+
+    const AltAz NRY(fNry*cos(p.Alt()), -fNry*tan(p.Alt()));
+    const AltAz NRX(fNrx*sin(p.Alt()), -fNrx);
     p -= NRY;
     p -= NRX;
 
-    const AltAz CRY(-fCry*kDeg2Rad*cos(p.Az()-p.Alt()), -fCry*kDeg2Rad*sin(p.Az()-p.Alt())/cos(p.Alt()));
-    const AltAz CRX(-fCrx*kDeg2Rad*sin(p.Az()-p.Alt()),  fCrx*kDeg2Rad*cos(p.Az()-p.Alt())/cos(p.Alt()));
+    const AltAz CRY(-fCry*cos(p.Az()-p.Alt()), -fCry*sin(p.Az()-p.Alt())/cos(p.Alt()));
+    const AltAz CRX(-fCrx*sin(p.Az()-p.Alt()),  fCrx*cos(p.Az()-p.Alt())/cos(p.Alt()));
     p -= CRY;
     p -= CRX;
 
-    const AltAz CEC(-fEcec*kDeg2Rad*cos(p.Alt()), -fAcec*kDeg2Rad*cos(p.Az()));
-    const AltAz CES(-fEces*kDeg2Rad*sin(p.Alt()), -fAces*kDeg2Rad*sin(p.Az()));
+    const AltAz CEC(-fEcec*cos(p.Alt()), -fAcec*cos(p.Az()));
+    const AltAz CES(-fEces*sin(p.Alt()), -fAces*sin(p.Az()));
     p -= CEC;
     p -= CES;

trunk/MagicSoft/Cosy/tpoint/tpointfit.C

@@ -348 +348 @@
     Int_t ierflg = 0;
 
-    //    minuit.FixParameter(2); // NPAE
-    //    minuit.FixParameter(3); // CA
-    //    minuit.FixParameter(4); // AN
-    //    minuit.FixParameter(5); // AW
-    minuit.FixParameter(6);  // NRX
-    minuit.FixParameter(7);  // NRY
+   //  minuit.FixParameter(2); // NPAE
+   //  minuit.FixParameter(3); // CA
+   //  minuit.FixParameter(4); // AN
+   //  minuit.FixParameter(5); // AW
+   // minuit.FixParameter(6);  // NRX
+   // minuit.FixParameter(7);  // NRY
     minuit.FixParameter(8);  // CRX
     minuit.FixParameter(9);  // CRY
-    //    minuit.FixParameter(10); // ECES
-    //    minuit.FixParameter(11); // ACES
-    minuit.FixParameter(12); // ECEC
-    minuit.FixParameter(13); // ACEC
-    //minuit.FixParameter(14); // MAGIC1
+   //  minuit.FixParameter(10); // ECES
+   //  minuit.FixParameter(11); // ACES
+   //  minuit.FixParameter(12); // ECEC
+   //  minuit.FixParameter(13); // ACEC
+    // minuit.FixParameter(14); // MAGIC1
     minuit.FixParameter(15); // MAGIC2