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

Timestamp:

04/23/07 20:11:25 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/callisto.cc

@@ -55 +55 @@
     gLog << "   -y                        Extract and calibrate signal" << endl << endl;
     gLog << " Data Type (exclusive):" << endl;
-    gLog << "   -raw                      Read input from raw-data <default>" << endl;
     gLog << "   -mc                       Input root-files are monte carlo files" << endl;
-    gLog << "   -root                     Read input from root-files (merpped)" << endl << endl;
     gLog << " Options:" << endl;
     gLog.Usage();
@@ -192 +190 @@
           Bool_t  kModeC      = arg.HasOnlyAndRemove("-c");
           Bool_t  kModeY      = arg.HasOnlyAndRemove("-y");
-
-    MJCalib::DataType_t kDataType = MJCalib::kIsUseRawData; // root
-    if (arg.HasOnlyAndRemove("-root"))
-        kDataType = MJCalib::kIsUseRootData; // root
-    if (arg.HasOnlyAndRemove("-raw"))
-        kDataType = MJCalib::kIsUseRawData;  // raw
-    if (arg.HasOnlyAndRemove("-mc"))
-        kDataType = MJCalib::kIsUseMC;       // monte carlo
+    const Bool_t  kIsMC       = arg.HasOnlyAndRemove("-mc");
 
     if (!kInpathY.IsNull() || !kOutpathY.IsNull() || !kOutpath.IsNull() || !kPath.IsNull())
@@ -267 +258 @@
     TString kSequence = arg.GetArgumentStr(0);
 
-    if (kSequence.IsDigit())
-    {
-        const Int_t numseq = kSequence.Atoi();
-        kSequence = Form("/magic/sequences/%04d/sequence%08d.txt", numseq/10000, numseq);
-        gLog << inf << "Inflated sequence file: " << kSequence << endl;
-    }
-
-    if (gSystem->AccessPathName(kSequence, kFileExists))
-    {
-        gLog << err << "Sorry, sequence file '" << kSequence << "' doesn't exist." << endl;
+    if (!MSequence::InflatePath(kSequence, kIsMC))
         return 3;
-    }
 
     if (gSystem->AccessPathName(kConfig, kFileExists))
@@ -293 +274 @@
     //
     MSequence seq(kSequence, kInpathD);
+    if (!seq.IsMonteCarlo())
+        seq.SetMonteCarlo(kIsMC);
     if (kPrintSeq)
     {
@@ -310 +293 @@
     //
     if (kPrintFiles)
-        PrintFiles(seq, kInpathD, kDataType==MJCalib::kIsUseRawData, kFALSE);
+        PrintFiles(seq, kInpathD, !seq.IsMonteCarlo(), kFALSE);
     if (kPrintFound)
-        PrintFiles(seq, kInpathD, kDataType==MJCalib::kIsUseRawData, kTRUE);
+        PrintFiles(seq, kInpathD, !seq.IsMonteCarlo(), kTRUE);
 
     if (seq.HasMoon())
@@ -381 +364 @@
         job1.SetDisplay(d);
         job1.SetOverwrite(kOverwrite);
-        job1.SetDataType(kDataType);
         job1.SetUseHists(kMoon);
 
@@ -411 +393 @@
         job2.SetDisplay(d);;
         job2.SetOverwrite(kOverwrite);
-        job2.SetDataType(kDataType);
         job2.SetUseHists(kMoon);
         job2.SetDeadPixelCheck();
@@ -447 +428 @@
         job3.SetOverwrite(kOverwrite);
         job3.SetPathOut(kOutpathC);
-        job3.SetDataType(kDataType);
         // job2.SetPathIn(kInpathC); // not yet needed
 
@@ -479 +459 @@
             job4.SetOverwrite(kOverwrite);
             job4.SetPathOut(kOutpathC);
-            job4.SetDataType(kDataType);
 
             if (!job4.Process(job1.GetPedestalCam()))
@@ -514 +493 @@
         job1.SetOverwrite(kOverwrite);
         job1.SetPathIn(kInpathY);   // --> READ Extractor from calib-file
-        job1.SetDataType(kDataType);
         //job1.SetPathOut(kOutpathY);   // not yet needed
         job1.SetUseData();
@@ -544 +522 @@
         job2.SetOverwrite(kOverwrite);
         job2.SetPathIn(kInpathY);
-        job2.SetDataType(kDataType);
-        job2.SetPulsePosCheck(kDataType!=MJCalib::kIsUseMC);
+        job2.SetPulsePosCheck(!seq.IsMonteCarlo());
         job2.SetPathOut(kOutpathY); // for updating the extractor
 
@@ -600 +577 @@
         job3.SetOverwrite(kOverwrite);
         job3.SetPathIn(kInpathY);
-        job3.SetDataType(kDataType);
         // job1.SetPathOut(kOutpathC); // not yet needed
         // job1.SetPathIn(kInpathC);   // not yet needed
@@ -634 +610 @@
         job4.SetPathIn(kInpathY);
         job4.SetPathOut(kOutpathY);
-        job4.SetDataType(kDataType);
         job4.SetMovieMode(kMovie);
-        if (kDataType!=MJCalib::kIsUseMC)
+        if (!seq.IsMonteCarlo())
             job4.SetExtractor(job2.GetExtractor());