Changeset 6282

Timestamp:

02/07/05 18:16:48 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• callisto.cc (modified) (15 diffs)
• ganymed.cc (added)
• ganymed.rc (added)
• mhflux/MAlphaFitter.cc (modified) (6 diffs)
• mjobs/MJCalib.h (modified) (1 diff)
• mjobs/MJCut.cc (added)
• mjobs/MJCut.h (added)
• mjobs/MJOptimize.cc (added)
• mjobs/MJOptimize.h (added)
• mjobs/MSequences.cc (added)
• mjobs/MSequences.h (added)

trunk/MagicSoft/Mars/Changelog

@@ -52 +52 @@
        common code from derived classes into the base-class
      - implemented CheckEnvLocal to handle the resource 'DataType'
+     - changed publicity of some variables and functions
+       to allow setting file type from outside
+     - added new function to set data-type for use in callisto.cc
 
    * mjobs/MJCalibTest.[h,cc], mjobs/MJCalibrateSignal.[h,cc],
@@ -63 +66 @@
        be able to write a function description about it (simple
        copy&past)
+
+   * callisto.cc:
+     - added option for file-type
+
+   * mjobs/MJOptimize.[h,cc], mjobs/MSequences.[h,cc],
+     mjobs/MJCut.[h,cc], ganymed.[cc,rc]:
+     - added to repository, but not yet to Makefile because
+       there is still some work to be done. But whoever is
+       interested in the new classes/program may already use it.
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -52 +52 @@
     gLog << "   -c                        Calculate the calibration constants" << endl;
     gLog << "   -y                        Extract and calibrate signal" << endl << endl;
+    gLog << " Data Type (exclusive):" << endl;
+    gLog << "   -raw                      Read input from raw-data" << endl;
+    gLog << "   -mc                       Input root-files are monte carlo files" << endl;
+    gLog << "   -root                     Read input from root-files (merpped) <default>" << endl << endl;
     gLog << " Options:" << endl;
     gLog.Usage();
@@ -72 +76 @@
     gLog << "   --print-files             Print Files taken from Sequence" << endl;
     gLog << "   --print-only              Do not execute anything except print" << endl;
-    gLog << "   --use-test                Apply cal. const. to the same cal. file (for testing)" << endl;
+    gLog << "   --use-test                Apply calibration constants to same calibration" << endl;
+    gLog << "                             file (for testing, calibration mode only)" << endl;
     gLog << "   --config=callisto.rc      Resource file [default=callisto.rc]" << endl;
     gLog << endl;
@@ -141 +146 @@
           Bool_t  kModeY      = arg.HasOnlyAndRemove("-y");
 
+    MJCalib::DataType_t kDataType = MJCalib::kIsUseRootData; // root
+    if (arg.HasOnlyAndRemove("-raw"))
+        kDataType = MJCalib::kIsUseRawData;  // raw
+    if (arg.HasOnlyAndRemove("-mc"))
+        kDataType = MJCalib::kIsUseMC;       // monte carlo
+
     if (!kInpathY.IsNull() || !kOutpathY.IsNull() || !kOutpath.IsNull() || !kPath.IsNull())
         kModeY = kTRUE;
@@ -146 +157 @@
         kModeC = kTRUE;
 
-    if (!kModeC && !kModeY)
-    {
-        gLog << err << "Neither calibration (-c) nor signal extraction (-y) mode specified!" << endl;
+    if (!kModeC && !kModeY /*&& !kUseTest*/)
+    {
+        gLog << err << "Neither calibration (-c) nor signal extraction (-y) or test-mode (--use-test) specified!" << endl;
         Usage();
         return 0;
     }
 
-    if (kModeC && kOutpathC.IsNull())
+    if ((kModeC/* || kUseTest*/) && kOutpathC.IsNull())
         kOutpathC = ".";
     if (kModeY)
@@ -182 +193 @@
         arg.Print("options");
         gLog << endl;
+        return -1;
     }
 
@@ -289 +301 @@
     d->SetTitle(kSequence);
 
-    if (kModeC)
+    if (kModeC/* || kUseTest*/)
     {
         //
@@ -302 +314 @@
         job1.SetOverwrite(kOverwrite);
         job1.SetPathData(kInpathD);
+        job1.SetDataType(kDataType);
 
         job1.SetExtractionFundamental();
@@ -330 +343 @@
         job2.SetOverwrite(kOverwrite);
         job2.SetPathData(kInpathD);
+        job2.SetDataType(kDataType);
         // job1.SetPathOut(kOutpathC); // not yet needed
         // job1.SetPathIn(kInpathC);   // not yet needed
@@ -351 +365 @@
         }
 
-        //
-        // Do calibration
-        //
-        MJCalibration job3(Form("MJCalibration #%d", seq.GetSequence()));
-        job3.SetSequence(seq);
-        job3.SetEnv(kConfig);
-        job3.SetEnvDebug(kDebugEnv);
-        job3.SetDisplay(d);;
-        job3.SetOverwrite(kOverwrite);
-        job3.SetPathOut(kOutpathC);
-        job3.SetPathData(kInpathD);
-        // job2.SetPathIn(kInpathC); // not yet needed
-
-        job3.SetBadPixels(job2.GetBadPixels());
-        job3.SetExtractor(job2.GetExtractor());
-        job3.SetExtractorCam(job2.GetPedestalCam());
-
-        if (!job3.ProcessFile(job1.GetPedestalCam()))
-        {
-            gLog << err << "Calculation of calibration failed." << endl << endl;
-            return -1;
-        }
-
-        if (!job3.GetDisplay())
-        {
-            gLog << warn << "Display closed by user... execution aborted." << endl << endl;
-            return 1;
+        if (kModeC)
+        {
+            //
+            // Do calibration
+            //
+            MJCalibration job3(Form("MJCalibration #%d", seq.GetSequence()));
+            job3.SetSequence(seq);
+            job3.SetEnv(kConfig);
+            job3.SetEnvDebug(kDebugEnv);
+            job3.SetDisplay(d);
+            job3.SetOverwrite(kOverwrite);
+            job3.SetPathOut(kOutpathC);
+            job3.SetPathData(kInpathD);
+            job3.SetDataType(kDataType);
+            // job2.SetPathIn(kInpathC); // not yet needed
+
+            job3.SetBadPixels(job2.GetBadPixels());
+            job3.SetExtractor(job2.GetExtractor());
+            job3.SetExtractorCam(job2.GetPedestalCam());
+
+            if (!job3.ProcessFile(job1.GetPedestalCam()))
+            {
+                gLog << err << "Calculation of calibration failed." << endl << endl;
+                return -1;
+            }
+
+            if (!job3.GetDisplay())
+            {
+                gLog << warn << "Display closed by user... execution aborted." << endl << endl;
+                return 1;
+            }
         }
 
@@ -383 +401 @@
         {
             MJCalibTest job4(Form("MJCalibTest #%d", seq.GetSequence()));
-            job4.SetBadPixels(job3.GetBadPixels());
+            job4.SetBadPixels(job2.GetBadPixels());
             job4.SetSequence(seq);
             job4.SetEnv(kConfig);
@@ -391 +409 @@
             job4.SetPathOut(kOutpathC);
             job4.SetPathData(kInpathD);
+            job4.SetDataType(kDataType);
 
             if (!job4.ProcessFile(job1.GetPedestalCam()))
@@ -423 +442 @@
         job1.SetPathData(kInpathD);
         job1.SetPathIn(kInpathY);
+        job1.SetDataType(kDataType);
         //job1.SetPathOut(kOutpathY);   // not yet needed
         job1.SetUseData();
@@ -452 +472 @@
         job2.SetPathData(kInpathD);
         job2.SetPathIn(kInpathY);
+        job2.SetDataType(kDataType);
         // job1.SetPathOut(kOutpathC); // not yet needed
         // job1.SetPathIn(kInpathC);   // not yet needed
@@ -486 +507 @@
         job3.SetPathData(kInpathD);
         job3.SetPathIn(kInpathY);
+        job3.SetDataType(kDataType);
         // job1.SetPathOut(kOutpathC); // not yet needed
         // job1.SetPathIn(kInpathC);   // not yet needed
@@ -519 +541 @@
         job4.SetPathOut(kOutpathY);
         job4.SetPathData(kInpathD);
+        job4.SetDataType(kDataType);
 
         // Where to search for calibration files

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -140 +140 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
+    //           E  Perform better Errors estimation using Minos technique
     h.Fit(fFunc, "NQI", "", bgmin, bgmax);
 
@@ -175 +176 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
+    //           E  Perform better Errors estimation using Minos technique
     h.Fit(fFunc, "NQI", "", 0, sigmax);
 
@@ -261 +263 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
+    //           E  Perform better Errors estimation using Minos technique
     TH1D h(hon);
     h.Add(&hof, -1);
@@ -317 +320 @@
     f.fScaleMode    = fScaleMode;
     f.fScaleUser    = fScaleUser;
+    f.fStrategy     = fStrategy;
     f.fCoefficients.Set(fCoefficients.GetSize());
     f.fCoefficients.Reset();
@@ -494 +498 @@
 }
 
+Double_t MAlphaFitter::GetMinimizationValue() const
+{
+    switch (fStrategy)
+    {
+    case kSignificance:
+        return -GetSignificance();
+    case kSignificanceChi2:
+        return -GetSignificance()/GetChiSqSignal();
+    }
+    return 0;
+}
+
 Int_t MAlphaFitter::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
@@ -537 +553 @@
     }
 
-    return rc;
-}
+    if (IsEnvDefined(env, prefix, "MinimizationStrategy", print))
+    {
+        TString txt = GetEnvValue(env, prefix, "MinimizationStrategy", "");
+        txt = txt.Strip(TString::kBoth);
+        txt.ToLower();
+        if (txt==(TString)"Significance")
+            fStrategy = kSignificance;
+        if (txt==(TString)"SignificanceChi2")
+            fStrategy = kSignificanceChi2;
+        rc = kTRUE;
+    }
+
+    return rc;
+}

trunk/MagicSoft/Mars/mjobs/MJCalib.h

@@ -10 +10 @@
 class MJCalib : public MJob
 {
+public:
+    enum DataType_t
+    {
+        kIsUseRootData,
+        kIsUseRawData,
+        kIsUseMC
+    };
+
 private:
-    Byte_t    fDataFlag;      // Bit-field to store the data type
+    Byte_t fDataFlag;      // Bit-field to store the data type
 
 protected:
+    MRunIter *fRuns;          // Data files, only used for test applications, default is sequence files!
 
-  MRunIter *fRuns;          // Data files, only used for test applications, default is sequence files!
-  
-  enum DataType_t
-    {
-      kIsUseRawData,
-      kIsUseRootData,
-      kIsUseMC
-    };
-
-  Bool_t IsUseRawData()  const { return fDataFlag==kIsUseRawData;  }
-  Bool_t IsUseRootData() const { return fDataFlag==kIsUseRootData; }
-  Bool_t IsUseMC()       const { return fDataFlag==kIsUseMC;       }
-  
-  void   SetUseRawData ( const Bool_t b=kTRUE )  { fDataFlag=kIsUseRawData;  }
-  void   SetUseRootData( const Bool_t b=kTRUE )  { fDataFlag=kIsUseRootData; }
-  void   SetUseMC      ( const Bool_t b=kTRUE )  { fDataFlag=kIsUseMC;       }
-
-  Bool_t CheckEnvLocal();
+    Bool_t CheckEnvLocal();
 
 public:
+    MJCalib();
 
-  MJCalib();
+    void SetInput(MRunIter *iter) { fRuns = iter; }
+
+    Bool_t IsUseRawData()  const { return fDataFlag==kIsUseRawData;  }
+    Bool_t IsUseRootData() const { return fDataFlag==kIsUseRootData; }
+    Bool_t IsUseMC()       const { return fDataFlag==kIsUseMC;       }
+
+    void SetUseRawData () { fDataFlag=kIsUseRawData;  }
+    void SetUseRootData() { fDataFlag=kIsUseRootData; }
+    void SetUseMC      () { fDataFlag=kIsUseMC;       }
+
+    void SetDataType(DataType_t type) { fDataFlag=type; }
   
-  void SetInput      ( MRunIter *iter       )  { fRuns = iter; }
-  
-  ClassDef(MJCalib, 0) // Base class for calibration jobs
+    ClassDef(MJCalib, 0) // Base class for calibration jobs
 };