Changeset 6958

Timestamp:

04/19/05 18:09:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (1 diff)
• NEWS (modified) (1 diff)
• mhbase/MBinning.h (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (2 diffs)
• mhflux/MHAlpha.h (modified) (1 diff)
• mjobs/JobsLinkDef.h (modified) (1 diff)
• mjobs/MDataSet.cc (modified) (4 diffs)
• mjobs/MDataSet.h (modified) (2 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (2 diffs)
• mjobs/MJCut.cc (modified) (2 diffs)
• mjobs/MJSpectrum.cc (added)
• mjobs/MJSpectrum.h (added)
• mjobs/Makefile (modified) (1 diff)
• sponde.cc (added)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
    * mimage/MHVsSize.[h,cc]:
      - added more displayed variables
+
+   * mjobs/MJSpectrum.[h,cc]:
+     - added
+
+   * mjobs/Makefile, mjobs/JobsLinkDef.h:
+     - added MJSpectrum
+
+   * Makefile:
+     - added sponde.cc
+
+   * sponde.cc:
+     - added
+
+   * mhbase/MBinning.h:
+     - added Print() to //*MENU*
+
+   * mhflux/MAlphaFitter.cc:
+     - do not set inf-flag in Print()
+
+   * mhflux/MHAlpha.[h,cc]:
+     - set all-flag for printing MAlphaFitter("result")
+     - added Getter for excess histogram
+
+   * mjobs/MDataSet.[h,cc]:
+     - allow to initialize a TChain from this dataset
+
+   * mjobs/MJCut.cc:
+     - moved energy estimator back before Cut0 otherwise the
+       EnergyEst container is missing in summary file
+
 
 

trunk/MagicSoft/Mars/Makefile

@@ -20 +20 @@
 #
 #PROGRAMS = readraw merpp mars test mona status
-PROGRAMS = readdaq merpp readraw sinope callisto star ganymed showlog showplot mars
+PROGRAMS = readdaq merpp readraw sinope callisto star ganymed sponde showlog showplot mars
 SOLIB    = libmars.so
 CINT     = M

trunk/MagicSoft/Mars/NEWS

@@ -1 +1 @@
                                                                -*-*- END -*-*-
  *** Version <cvs>
+
+   - added a full featured spectrum program (sponde) which reads
+     ganymed output and monte carlos and compiles a spectrum
 
 

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -108 +108 @@
     void Apply(TH1 &) const;
 
-    void Print(Option_t *o="") const;
+    void Print(Option_t *o="") const; //*MENU*
 
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -328 +328 @@
 void MAlphaFitter::Print(Option_t *o) const
 {
-    *fLog << inf << GetDescriptor() << ": Fitting..." << endl;
+    *fLog << GetDescriptor() << ": Fitting..." << endl;
     *fLog << " ...background from " << fBgMin << " to " << fBgMax << endl;
     *fLog << " ...signal to " << fSigMax << " (integrate into bin at " << fSigInt << ")" << endl;

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -352 +352 @@
         fit->Copy(fFit);
 
+    *fLog << inf;
     fFit.Print();
 
@@ -864 +865 @@
 
     // Store the final result in fFit
+    *fLog << all;
     fFit.Print("result");
 

trunk/MagicSoft/Mars/mhflux/MHAlpha.h

@@ -137 +137 @@
     const MAlphaFitter &GetAlphaFitter() const { return fFit; }
 
+    const TH1D &GetHEnergy() const { return fHEnergy; }
+
     void SetOffData(const MHAlpha &h)
     {

trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h

@@ -18 +18 @@
 #pragma link C++ class MJCut+;
 #pragma link C++ class MJOptimize+;
+#pragma link C++ class MJSpectrum+;
 
 #endif

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -71 +71 @@
 
 #include <TEnv.h>
+#include <TChain.h>
 #include <TRegexp.h>
 #include <TSystem.h> // TSystem::ExpandPath
@@ -234 +235 @@
 }
 
-Bool_t MDataSet::AddSequencesToList(const TList &list, MRead &read)
-{
-    MDirIter files;
-
+Bool_t MDataSet::AddSequencesFromList(const TList &list, MDirIter &files)
+{
     TIter Next(const_cast<TList*>(&list));
     TObject *o=0;
@@ -258 +257 @@
         files.Print();
     }
-
+    return kTRUE;
+}
+
+Bool_t MDataSet::AddFilesOn(MRead &read) const
+{
+    MDirIter files;
+    if (!AddSequencesFromList(fSequencesOn, files))
+        return kFALSE;
+    return read.AddFiles(files)>0;
+}
+
+Bool_t MDataSet::AddFilesOff(MRead &read) const
+{
+    MDirIter files;
+    if (!AddSequencesFromList(fSequencesOff, files))
+        return kFALSE;
     return read.AddFiles(files)>0;
 }
@@ -269 +283 @@
 }
 
-Bool_t MDataSet::AddFilesOn(MRead &read) const
-{
-    return AddSequencesToList(fSequencesOn, read);
-}
-
-Bool_t MDataSet::AddFilesOff(MRead &read) const
-{
-    return AddSequencesToList(fSequencesOff, read);
+Int_t MDataSet::AddFilesToChain(MDirIter &files, TChain &chain)
+{
+    Int_t num=0;
+    while (1)
+    {
+        const TString fname = files.Next();
+        if (fname.IsNull())
+            break;
+
+        const Int_t n = chain.Add(fname);
+        if (n<=0)
+            return kFALSE;
+        num += n;
+    }
+    return num;
+}
+
+Bool_t MDataSet::AddFilesOn(TChain &chain) const
+{
+    MDirIter files;
+    if (!AddSequencesFromList(fSequencesOn, files))
+        return kFALSE;
+    return AddFilesToChain(files, chain)>0;
+}
+
+Bool_t MDataSet::AddFilesOff(TChain &chain) const
+{
+    MDirIter files;
+    if (!AddSequencesFromList(fSequencesOff, files))
+        return kFALSE;
+    return AddFilesToChain(files, chain)>0;
+}
+
+Bool_t MDataSet::AddFiles(TChain &read) const
+{
+    const Bool_t rc1 = AddFilesOff(read);
+    const Bool_t rc2 = AddFilesOn(read);
+    return rc1 && rc2;
 }
 

trunk/MagicSoft/Mars/mjobs/MDataSet.h

@@ -10 +10 @@
 #endif
 
+class TChain;
+
 class MRead;
+class MDirIter;
 class MPointingPos;
 
@@ -54 +57 @@
 
     // Setter
-    static Bool_t AddSequencesToList(const TList &list, MRead &read);
+    static Bool_t AddSequencesFromList(const TList &list, MDirIter &files);
+    static Int_t  AddFilesToChain(MDirIter &files, TChain &chain);
 
     Bool_t AddFiles(MRead &read) const;
     Bool_t AddFilesOn(MRead &read) const;
     Bool_t AddFilesOff(MRead &read) const;
+
+    Bool_t AddFiles(TChain &read) const;
+    Bool_t AddFilesOn(TChain &read) const;
+    Bool_t AddFilesOff(TChain &read) const;
 
     // TObject

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -373 +373 @@
             interlacedcont.Add(&hpndiod);
         if (fIsRelTimesUpdate)
-          interlacedcont.Add(&hrelcam);
+            interlacedcont.Add(&hrelcam);
     }
 
@@ -601 +601 @@
     // Intensity Calibration histogramming
     //
-    MFillH filpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode",   "FillPINDiode");
-    MFillH filbnd("MHCalibrationChargeBlindCam", "MExtractedSignalBlindPixel", "FillBlindCam");
-    MFillH filcam("MHCalibrationChargeCam",      "MExtractedSignalCam",        "FillChargeCam");
-    MFillH filtme("MHCalibrationRelTimeCam",     "MArrivalTimeCam",            "FillRelTime");
+    MFillH filpin(&hpndiod, "MExtractedSignalPINDiode",   "FillPINDiode");
+    MFillH filbnd(&hbndcam, "MExtractedSignalBlindPixel", "FillBlindCam");
+    MFillH filcam(&hchacam, "MExtractedSignalCam",        "FillChargeCam");
+    MFillH filtme(&hrelcam, "MArrivalTimeCam",            "FillRelTime");
     MFillH filhil("MHCalibrationHiLoCam",        "MExtractedSignalCam",        "FillHiLoRatio");
     MFillH filpul("MHCalibrationPulseTimeCam",   "MRawEvtData",                "FillPulseTime");
-
     filpin.SetBit(MFillH::kDoNotDisplay);
     filbnd.SetBit(MFillH::kDoNotDisplay);

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -495 +495 @@
     if (fIsWobble)
         tlist2.AddToList(&hcalc2);
+    tlist2.AddToList(&taskenv1);
     tlist2.AddToList(&taskenv2);
     tlist2.AddToList(&cont0);
@@ -502 +503 @@
         tlist2.AddToList(&fill1a);
     tlist2.AddToList(&cont1);
-    tlist2.AddToList(&taskenv1);
     if (!fWriteOnly && !fIsWobble)
         tlist2.AddToList(&ffs);

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -35 +35 @@
            MJStar.cc \
            MJCut.cc \
-           MJOptimize.cc
+           MJOptimize.cc \
+           MJSpectrum.cc
 
 ############################################################