Changeset 4723 for trunk/MagicSoft/Mars/callisto.cc

Timestamp:

08/24/04 18:15:29 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/callisto.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/callisto.cc

@@ -16 +16 @@
 #include "MJPedestal.h"
 #include "MJCalibration.h"
+#include "MJCalibrateSignal.h"
 
 using namespace std;
@@ -40 +41 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " callisto [options] sequence.txt" << endl << endl;
+    gLog << " callisto [-c] [-y] [options] sequence.txt" << endl << endl;
     gLog << " Arguments:" << endl;
     gLog << "   sequence.txt:             An ascii file defining a sequence of runs" << endl;
     gLog << " Root Options:" << endl;
     gLog << "   -b                        Batch mode (no graphical output to screen)" << endl<<endl;
+    gLog << " Operation Modes:" << endl;
+    gLog << "   -c                        Calculate the calibration constants" << endl;
+    gLog << "   -y                        Extract and calibrate signal" << endl << endl;
     gLog << " Options:" << endl;
     gLog.Usage();
@@ -50 +54 @@
     gLog << "   -f                        Force overwrite of existing files" << endl;
     gLog << "   --in=path                 Path where to search for the data files" << endl;
-    gLog << "   --out=path                Path where to write the result to" << endl;
+    gLog << "                             [default=standard path in datacenter]" << endl;
+    gLog << "   --iny=path                Path where to search for the calibration files" << endl;
+    gLog << "                             [default=local path or output path of Mode-C]" << endl;
+    gLog << "   --out=path                Path to write the all results to [def=local path]" << endl;
+    gLog << "   --outc=path               Path to write Mode-C result to   [def=local path]" << endl;
+    gLog << "   --outy=path               Path to write Mode-Y result to   [def=local path]" << endl;
     gLog << "   --printseq                Print Sequence information" << endl;
     gLog << "   --printfiles              Print Files taken from Sequence" << endl;
@@ -92 +101 @@
     const Bool_t  kPrintOnly  = arg.HasOnlyAndRemove("--printonly");
     const Bool_t  kOverwrite  = arg.HasOnlyAndRemove("-f");
+    const TString kInpathY    = arg.GetStringAndRemove("--iny=",  "");
+          TString kInpath     = arg.GetStringAndRemove("--in=",  "");
     const TString kOutpath    = arg.GetStringAndRemove("--out=", "");
-    const TString kInpath     = arg.GetStringAndRemove("--in=",  "");
-
+          TString kOutpathC   = arg.GetStringAndRemove("--outc=", "");
+          TString kOutpathY   = arg.GetStringAndRemove("--outy=", "");
+
+    const Bool_t  kModeC      = arg.HasOnlyAndRemove("-c");
+    const Bool_t  kModeY      = arg.HasOnlyAndRemove("-y");
+
+    if (!kModeC && !kModeY)
+    {
+        gLog << err << "Neither calibration (-c) nor signal extraction (-y) mode specified!" << endl;
+        return 0;
+    }
+
+    if (!kOutpath.IsNull())
+    {
+        if (!kOutpathC.IsNull() || !kOutpathY.IsNull())
+        {
+            gLog << err << "You cannot use --out= and --outc= or --outy= together!" << endl;
+            return 0;
+        }
+        if (kOutpathC.IsNull())
+            kOutpathC = kOutpath;
+        if (kOutpathY.IsNull())
+            kOutpathY = kOutpath;
+    }
     if (arg.GetNumOptions()>0)
     {
@@ -116 +149 @@
     if (gROOT->IsBatch() || !gClient)
     {
-        gLog << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;
+        gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;
         return 1;
     }
@@ -164 +197 @@
     d->SetTitle(kSequence);
 
-    MJPedestal job1;
-    job1.SetSequence(&seq);
-    job1.SetEnv(kConfig);
-    job1.SetDisplay(d);;
-    job1.SetOutputPath(kOutpath);
-
-    if (!job1.ProcessFile())
-    {
-        gLog << err << "Calculation of pedestal failed." << endl << endl;
-        return -1;
-    }
-
-    if (!job1.GetDisplay())
-    {
-        gLog << warn << "Display closed by user... execution aborted." << endl << endl;
-        return 1;
-    }
-
-    MJCalibration job2;
-    job2.SetSequence(&seq);
-    job2.SetEnv(kConfig);
-    job2.SetDisplay(d);;
-    job2.SetBadPixels(job1.GetBadPixels());
-    job2.SetOutputPath(kOutpath);
-    job2.SetOverwrite(kOverwrite);
-
-    if (!job2.ProcessFile(job1.GetPedestalCam()))
-    {
-        gLog << err << "Calculation of calibration failed." << endl << endl;
-        return -1;
-    }
-
-    if (!job2.GetDisplay())
-    {
-        gLog << warn << "Display closed by user... execution aborted." << endl << endl;
-        return 1;
+    if (kModeC)
+    {
+        MJPedestal job1("MJPedestal1");
+        job1.SetSequence(&seq);
+        job1.SetEnv(kConfig);
+        job1.SetDisplay(d);;
+        job1.SetInputPath(kInpath);
+        job1.SetOutputPath(kOutpathC);
+        job1.SetOverwrite(kOverwrite);
+
+        if (!job1.ProcessFile())
+        {
+            gLog << err << "Calculation of pedestal failed." << endl << endl;
+            return -1;
+        }
+
+        if (!job1.GetDisplay())
+        {
+            gLog << warn << "Display closed by user... execution aborted." << endl << endl;
+            return 1;
+        }
+
+        MJCalibration job2("MJCalibration");
+        job2.SetSequence(&seq);
+        job2.SetEnv(kConfig);
+        job2.SetDisplay(d);;
+        job2.SetBadPixels(job1.GetBadPixels());
+        job2.SetInputPath(kInpath);
+        job2.SetOutputPath(kOutpathC);
+        job2.SetOverwrite(kOverwrite);
+
+        if (!job2.ProcessFile(job1.GetPedestalCam()))
+        {
+            gLog << err << "Calculation of calibration failed." << endl << endl;
+            return -1;
+        }
+
+        if (!job2.GetDisplay())
+        {
+            gLog << warn << "Display closed by user... execution aborted." << endl << endl;
+            return 1;
+        }
+    }
+
+    if (kModeY)
+    {
+        d->Reset();
+
+        MJCalibrateSignal job("MJCalibrateSignal");
+        job.SetDisplay(d);;
+        job.SetInputPath(kInpath); // Where to search for data files
+        job.SetOutputPath(kOutpathY);
+        job.SetOverwrite(kOverwrite);
+        // Where to search for calibration files
+        if (!job.ProcessFile(seq, kConfig, kModeC ? kOutpathC : kInpathY))
+            return -1;
+
+        if (!job.GetDisplay())
+        {
+            gLog << warn << "Display closed by user... execution aborted." << endl << endl;
+            return 1;
+        }
     }