Changeset 8973 for trunk

Timestamp:

06/18/08 13:06:48 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (1 diff)
• telesto.cc (modified) (5 diffs)
• tpoint/TPointGui.cc (modified) (3 diffs)
• tpoint/TPointGui.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2008/06/18 Thomas Bretz
+
+  * telesto.cc, tpoint/TPointGui.[h,cc]:
+     - added option to start with a pointing model
+
+
 
  2008/06/17 Thomas Bretz

trunk/MagicSoft/Cosy/telesto.cc

@@ -45 +45 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " telestop [file.txt|file.col]" << endl << endl;
+    gLog << " telestop [file.txt|file.col [pointing.mod]]" << endl << endl;
     gLog << " Arguments:" << endl;
-    gLog << "   n/a" << endl;
-    gLog << "                             For more details see MSequence" << endl;
+    gLog << "   file.txt|file.col         A collection of files or a file with tpoints" << endl;
+    gLog << "   pointing.mod              A pointing model to load at startup" << endl << endl;
     gLog << " Root Options:" << endl;
     gLog << "   -b                        Batch mode (no graphical output to screen)" << endl<<endl;
@@ -61 +61 @@
     gLog << "                             (Note, that this option can be used multiple times." << endl;
     gLog << endl;
-//    gLog << " Input Options:" << endl;
-//    gLog << "   -mc                       You must use this for MC files (PRELIMINARY)" << endl << endl;
     gLog << " Output options:" << endl;
 //    gLog << "   -q                        Quit when job is finished" << endl;
 //    gLog << "   -f                        Force overwrite of existing files" << endl;
-//    gLog << "   -ff                       Force execution if not all files found" << endl;
-//    gLog << "   --ind=path                Path where to search for the calibrated data (Y)" << endl;
-//    gLog << "                             [default=standard path in datacenter]" << endl;
-//    gLog << "   --out=path                Path to write the all results to [def=local path]" << endl;
-//    gLog << "                             (overwrites --outc and --outy)" << endl;
-//    gLog << "   --no-muons                Switch off Muon analysis (for fast tests)" << endl;
-//    gLog << "   --print-seq               Print Sequence information" << endl;
-//    gLog << "   --print-files             Print Files taken from Sequence" << endl;
-//    gLog << "   --print-found             Print Files found from Sequence" << endl;
-//    gLog << "   --config=star.rc          Resource file [default=star.rc]" << endl;
     gLog << endl;
     gLog << "   --version, -V             Show startup message with version number" << endl;
@@ -123 +111 @@
     // check for the right usage of the program (number of arguments)
     //
-    if (arg.GetNumArguments()>1)
+    if (arg.GetNumArguments()>2)
     {
         gLog << warn << "WARNING - Wrong number of arguments..." << endl;
@@ -131 +119 @@
 
     TString fname=arg.GetArgumentStr(0);
+    TString mod  =arg.GetArgumentStr(1);
 
     //
@@ -156 +145 @@
         TObject::SetObjectStat(kTRUE);
 
-    TPointGui *gui = new TPointGui(fname.IsNull()?0:(const char*)fname);
+    TPointGui *gui = new TPointGui(fname, mod);
     gui->SetExitLoopOnClose();
 

trunk/MagicSoft/Cosy/tpoint/TPointGui.cc

@@ -33 +33 @@
 using namespace std;
 
-TPointGui::TPointGui(const char *fname) : TGMainFrame(gClient->GetRoot(), 750, 435, kHorizontalFrame), fExitLoopOnClose(kFALSE),
+TPointGui::TPointGui(const char *fname, const char *mod) : TGMainFrame(gClient->GetRoot(), 750, 435, kHorizontalFrame), fExitLoopOnClose(kFALSE),
    fAzMin(-180), fAzMax(180), fZdMin(0), fZdMax(90), fLimit(0.05)
 {
@@ -274 +274 @@
     MapWindow();
 
-    if (fname)
+    if (!TString(fname).IsNull())
         LoadStars(fname);
+    if (!TString(mod).IsNull())
+        fBending.Load(mod);
 
     DisplayBending();
@@ -310 +312 @@
 
         Double_t err = 0.01; // [deg] = 0.25SE
-        Double_t res = set.GetResidual(); //(&err);
+        Double_t res = set.GetResidual();//(&err);
         res /= err;
+
+        cout << err << endl;
 
         f += res*res;

trunk/MagicSoft/Cosy/tpoint/TPointGui.h

@@ -86 +86 @@
 
 public:
-    TPointGui(const char *fname=NULL);
+    TPointGui(const char *fname=NULL, const char *mod=NULL);
     ~TPointGui();