Changeset 8802

Timestamp:

01/09/08 11:45:59 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Cosy/Changelog (modified) (1 diff)
• Cosy/tpoint/gui.C (modified) (12 diffs)
• Mars/Changelog (modified) (1 diff)
• Mars/mpointing/MSrcPosCam.h (modified) (1 diff)
• Mars/mpointing/MSrcPosRndm.cc (modified) (2 diffs)
• Mars/mpointing/MSrcPosRndm.h (modified) (1 diff)
• Mars/mraw/MRawRunHeader.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2008/01/09 Thomas Bretz
+
+   * tpoint/gui.C:
+     - some small improvements
+
+
 
  2007/06/06 Thomas Bretz

trunk/MagicSoft/Cosy/tpoint/gui.C

@@ -485 +485 @@
         gmaz.SetMarkerStyle(kFullDotMedium);;
         gmzd.SetMarkerStyle(kFullDotMedium);
-    
+
         TMinuit minuit(MPointing::GetNumPar());  //initialize TMinuit with a maximum of 5 params
         minuit.SetObjectFit(this);
         minuit.SetPrintLevel(-1);
         minuit.SetFCN(fcn);
-    
+
         fBending.SetMinuitParameters(minuit, MPointing::GetNumPar()); // Init Parameters [deg]
-    
+
         for (int i=0; i<MPointing::GetNumPar(); i++)
         {
@@ -500 +500 @@
                 minuit.Release(i);
         }
-    
+
         //minuit.Command("SHOW PARAMETERS");
         //minuit.Command("SHOW LIMITS");
-    
+
         cout << endl;
         cout << "Starting fit..." << endl;
@@ -509 +509 @@
         cout << "0.02deg (=1SE) is assumed." << endl;
         cout << endl;
-    
+
         Int_t ierflg = 0;
         ierflg = minuit.Migrad();
@@ -516 +516 @@
         ierflg = minuit.Migrad();
         cout << "Migrad returns " << ierflg << endl << endl;
-    
+
         //
         // Get Fit Results
@@ -524 +524 @@
         cout << endl;
         //fBending.Save("bending_magic.txt");
-    
-    
+
+
         //
         // Make a copy of all list entries
@@ -533 +533 @@
         for (int i=0; i<fCoordinates.GetSize(); i++)
             list.Add(new Set(*(Set*)fCoordinates.At(i)));
-    
+
         //
         // Correct for Offsets only
@@ -541 +541 @@
         for (int i=2; i<MPointing::GetNumPar(); i++)
             par[i]=0;
-    
+
         MPointing b2;
         b2.SetParameters(par);
@@ -989 +989 @@
     }
 
-    void LoadCollection(TString fname)
+    Bool_t LoadCollection(TString fname)
     {
         ifstream fin(fname);
@@ -995 +995 @@
         {
             cout << "Collection '" << fname << "' not found!" << endl;
-            return;
+            return kFALSE;
         }
 
@@ -1013 +1013 @@
             if (!line.EndsWith(".txt"))
             {
-                cout << "WARNING: " << line << endl;
+                cout << "WARNING - Wring extension: " << line << endl;
                 continue;
             }
 
-            LoadStars(line);
-        }
-    }
-
-
-    void LoadStars(TString fname="tpoint.txt")
-    {
-        if (fname.EndsWith(".col"))
-        {
-            LoadCollection(fname);
-            fFileNameStars = fname;
-            return;
-        }
-
+            if (!LoadStarFile(line))
+                return kFALSE;
+        }
+        return kTRUE;
+    }
+
+    Bool_t LoadStarFile(TString fname)
+    {
         const Int_t size = fOriginal.GetSize();
 
@@ -1041 +1035 @@
         {
             cout << "File '" << fname << "' not found!" << endl;
-            return;
+            return kFALSE;
         }
 
@@ -1059 +1053 @@
         cout << " (Total=" << fOriginal.GetSize() << ")" << endl;
 
+        return kTRUE;
+    }
+
+    Bool_t LoadStars(TString fname="tpoint.txt")
+    {
+        const Bool_t iscol = fname.EndsWith(".col");
+
+        const Bool_t rc = iscol ? LoadCollection(fname) : LoadStarFile(fname);
+        if (!rc)
+            return kFALSE;
+
         fFileNameStars = fname;
+        SetWindowName(fname);
+
+        return kTRUE;
     }
 

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
    * mbadpixels/MBadPixelsTreat.[h,cc]:
      - removed obsolete fRawHeader
+
+   * mpointing/MSrcPosCam.[h,cc]:
+     - added Paint member function

trunk/MagicSoft/Mars/mpointing/MSrcPosCam.h

@@ -33 +33 @@
     TVector2 GetXY() const;
 
+    void Paint(Option_t *opt);
     void Print(Option_t *opt=NULL) const;
 

trunk/MagicSoft/Mars/mpointing/MSrcPosRndm.cc

@@ -68 +68 @@
         return kFALSE;
 
+    fSrcPosAnti = (MSrcPosCam*)plist->FindCreateObj("MSrcPosCam", "MSrcPosAnti");
+    if (!fSrcPosAnti)
+        return kFALSE;
+
     if (fDistOfSource<0)
     {
@@ -104 +108 @@
 
     fSrcPos->SetXY(x/fConvMm2Deg, y/fConvMm2Deg);
+    if (fDistOfSource>=0)
+        fSrcPosAnti->SetXY(-x/fConvMm2Deg, -y/fConvMm2Deg);
     return kTRUE;
 }

trunk/MagicSoft/Mars/mpointing/MSrcPosRndm.h

@@ -12 +12 @@
 {
 private:
-    MSrcPosCam   *fSrcPos; //!
-    MHSrcPosCam  *fHist;   //!
+    MSrcPosCam   *fSrcPos;     //!
+    MSrcPosCam   *fSrcPosAnti; //!
+    MHSrcPosCam  *fHist;       //!
 
     Double_t fConvMm2Deg;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -85 +85 @@
 //  -----------------
 //   - added fNumEventsRead;
+//   * renamed fFreqSampling to fSamplingFrequency
+//   * renamed fNumSignificantBits to fFadcResolution
 //
 //  Format Version 6:
@@ -487 +489 @@
     fNumBytesPerSample  = 1;      // 2 for MUX DATA
     fSamplingFrequency  = 300;
-    fFadcResolution = 8;
+    fFadcResolution     = 8;
+
     if (fFormatVersion>7)
     {
         fin.read((char*)&fNumBytesPerSample,  2);
         fin.read((char*)&fSamplingFrequency,  2); // [MHz], 2000 for MuxFadc
-        fin.read((char*)&fFadcResolution, 1); // nominal resolution [# Bits], 10 for MuxFadc
+        fin.read((char*)&fFadcResolution,     1); // nominal resolution [# Bits], 10 for MuxFadc
 
         if (fNumBytesPerSample!=2)