Changeset 4804

Timestamp:

08/30/04 16:06:09 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MPointing.cc (modified) (5 diffs)
• MPointing.h (modified) (3 diffs)
• Makefile (modified) (1 diff)
• PointingLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/mpointing/MPointing.cc

@@ -70 +70 @@
 
 #include <fstream>
-#include <iomanip>
 
 #include <TVector3.h>
@@ -97 +96 @@
 
     fCoeff = new Double_t*[fNumPar];
-    fName  = new TString[fNumPar];
+    fNames = new TString[fNumPar];
     fDescr = new TString[fNumPar];
 
-    fCoeff[ 0] = &fIa;      fName[ 0] = "IA";
-    fCoeff[ 1] = &fIe;      fName[ 1] = "IE";
-    fCoeff[ 2] = &fFlop;    fName[ 2] = "FLOP";
-    fCoeff[ 3] = &fAn;      fName[ 3] = "AN";
-    fCoeff[ 4] = &fAw;      fName[ 4] = "AW";
-    fCoeff[ 5] = &fNpae;    fName[ 5] = "NPAE";
-    fCoeff[ 6] = &fCa;      fName[ 6] = "CA";
-    fCoeff[ 7] = &fTf;      fName[ 7] = "TF";
-    fCoeff[ 8] = &fTx;      fName[ 8] = "TX";
-    fCoeff[ 9] = &fEces;    fName[ 9] = "ECES";
-    fCoeff[10] = &fAces;    fName[10] = "ACES";
-    fCoeff[11] = &fEcec;    fName[11] = "ECEC";
-    fCoeff[12] = &fAcec;    fName[12] = "ACEC";
-    fCoeff[13] = &fNrx;     fName[13] = "NRX";
-    fCoeff[14] = &fNry;     fName[14] = "NRY";
-    fCoeff[15] = &fCrx;     fName[15] = "CRX";
-    fCoeff[16] = &fCry;     fName[16] = "CRY";
-    fCoeff[17] = &fMagic1;  fName[17] = "MAGIC1";
-    fCoeff[18] = &fMagic2;  fName[18] = "MAGIC2";
+    fCoeff[ 0] = &fIa;      fNames[ 0] = "IA";
+    fCoeff[ 1] = &fIe;      fNames[ 1] = "IE";
+    fCoeff[ 2] = &fFlop;    fNames[ 2] = "FLOP";
+    fCoeff[ 3] = &fAn;      fNames[ 3] = "AN";
+    fCoeff[ 4] = &fAw;      fNames[ 4] = "AW";
+    fCoeff[ 5] = &fNpae;    fNames[ 5] = "NPAE";
+    fCoeff[ 6] = &fCa;      fNames[ 6] = "CA";
+    fCoeff[ 7] = &fTf;      fNames[ 7] = "TF";
+    fCoeff[ 8] = &fTx;      fNames[ 8] = "TX";
+    fCoeff[ 9] = &fEces;    fNames[ 9] = "ECES";
+    fCoeff[10] = &fAces;    fNames[10] = "ACES";
+    fCoeff[11] = &fEcec;    fNames[11] = "ECEC";
+    fCoeff[12] = &fAcec;    fNames[12] = "ACEC";
+    fCoeff[13] = &fNrx;     fNames[13] = "NRX";
+    fCoeff[14] = &fNry;     fNames[14] = "NRY";
+    fCoeff[15] = &fCrx;     fNames[15] = "CRX";
+    fCoeff[16] = &fCry;     fNames[16] = "CRY";
+    fCoeff[17] = &fMagic1;  fNames[17] = "MAGIC1";
+    fCoeff[18] = &fMagic2;  fNames[18] = "MAGIC2";
 
     fDescr[ 0] =  "Index Error Azimuth";
@@ -226 +225 @@
         Int_t n = -1;
         for (int i=0; i<fNumPar; i++)
-            if (str==fName[i])
+            if (str==fNames[i])
             {
                 n = i;
@@ -634 +633 @@
 
     while (n--)
-        m.mnparm(n, fName[n], *fCoeff[n]*kRad2Deg,  1, -360, 360, ierflg);
+        m.mnparm(n, fNames[n], *fCoeff[n]*kRad2Deg,  1, -360, 360, ierflg);
 }
 
@@ -681 +680 @@
     {
         m.GetParameter(n, par, err);
-        cout << Form(" %2d %6s: ", n, (const char*)fName[n]);
+        cout << Form(" %2d %6s: ", n, (const char*)fNames[n]);
         cout << setw(8) << par << " \xb1 " << setw(6) <<  err << endl;
     }

trunk/MagicSoft/Mars/mpointing/MPointing.h

@@ -66 +66 @@
 
     Double_t **fCoeff; //!
-    TString   *fName;  //!
+    TString   *fNames; //!
     TString   *fDescr; //!
 
@@ -88 +88 @@
     MPointing() { fError.Set(fNumPar); Init(); Clear(); }
     MPointing(const char *name) { fError.Set(fNumPar); Init(); Clear(); Load(name); }
-    virtual ~MPointing() { delete fName; delete fCoeff; delete fDescr; }
+    virtual ~MPointing() { delete fNames; delete fCoeff; delete fDescr; }
 
     void Load(const char *name);
@@ -161 +161 @@
     void PrintMinuitParameters(TMinuit &m, Int_t n=-1) const;
 
-    const TString &GetVarName(int i) const { return fName[i]; }
+    const TString &GetVarName(int i) const { return fNames[i]; }
     const TString &GetDescription(int i) const { return fDescr[i]; }
 

trunk/MagicSoft/Mars/mpointing/Makefile

@@ -22 +22 @@
            -I../mastro -I../mgeom
 
-SRCFILES = MPointingPos.cc \
+SRCFILES = MPointing.cc \
+           MPointingPos.cc \
            MPointingPosCalc.cc \
            MSrcPosCam.cc \

trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h

@@ -4 +4 @@
 #pragma link off all classes;
 #pragma link off all functions;
+
+#pragma link C++ class MPointing+;
 
 #pragma link C++ class MPointingPos+;