Index: /trunk/MagicSoft/Cosy/bending_magic.txt
===================================================================
--- /trunk/MagicSoft/Cosy/bending_magic.txt	(revision 1806)
+++ /trunk/MagicSoft/Cosy/bending_magic.txt	(revision 1806)
@@ -0,0 +1,19 @@
+MAGIC1 2003/03/02 21:59:35.620239
+S   00   000000   000000  0000000
+ IA     -49.372136 -1
+ IE     1.8923836 -1
+ CA     -0.84914789 -1
+ NPAE   -2.142261 -1
+ AN     0.90833138 -1
+ AW     0.93094796 -1
+ NRX    24.647251 -1
+ NRY    1.4925634 -1
+ CRX    0 -1
+ CRY    0 -1
+ ECES   15.454204 -1
+ ACES   0.090104657 -1
+ ECEC   -4.7751393 -1
+ ACEC   -0.082728729 -1
+ MAGIC1 0.1424389 -1
+ MAGIC2 0 -1
+END
Index: /trunk/MagicSoft/Cosy/main/MBending.cc
===================================================================
--- /trunk/MagicSoft/Cosy/main/MBending.cc	(revision 1805)
+++ /trunk/MagicSoft/Cosy/main/MBending.cc	(revision 1806)
@@ -178,6 +178,6 @@
     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,11 +186,12 @@
     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,30 +213,33 @@
     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;
Index: /trunk/MagicSoft/Cosy/tpoint/tpointfit.C
===================================================================
--- /trunk/MagicSoft/Cosy/tpoint/tpointfit.C	(revision 1805)
+++ /trunk/MagicSoft/Cosy/tpoint/tpointfit.C	(revision 1806)
@@ -348,17 +348,17 @@
     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