Changeset 4766 for trunk

Timestamp:

08/27/04 16:57:55 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (5 diffs)
• callisto.cc (modified) (1 diff)
• mars.rc (added)
• mbase/MArgs.cc (modified) (4 diffs)
• mbase/MArgs.h (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (1 diff)
• mcalib/MCalibrateData.cc (modified) (1 diff)
• mfileio/MReadReports.cc (modified) (2 diffs)
• mfileio/MReadReports.h (modified) (2 diffs)
• mfileio/MReadTree.cc (modified) (2 diffs)
• msignal/MExtractFixedWindow.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
- 2004/08/27: 
+ 2004/08/27: Markus Gaug
 
    * mjobs/MJCalibration.h
@@ -35 +35 @@
 
 
+
  2004/08/27: Thomas Bretz
 
@@ -43 +44 @@
    * callisto.cc: 
      - fixed some output
+     - fixed batch mode
 
    * mbadpixels/Makefile:
@@ -60 +62 @@
        took a lot of time.
 
-   * mjobs/MJCalibrateSignal.cc, mjobs/MJPedestal.cc:
+   * mjobs/MJCalibrateSignal.cc, mjobs/MJPedestal.cc, MJCalibration.cc:
      - added two empty lines to output if finished
+     - added a sanity check around the call to CheckEnv
 
    * mpedestal/MPedPhotCam.cc:
@@ -100 +103 @@
    * mmain/MEventDisplay.cc:
      - fixed reading of resource file
+
+   * mbase/MStatusDisplay.cc:
+     - made Reset() batch-mode safe
+
+   * mcalib/MCalibrateData.cc:
+     - simplified a calculation
+
+   * mfileio/MReadReports.[h,cc]:
+     - implemented GetEntries()
+     - implemented GetFileName()
+     - changed kHasMaster from BIT(15) to BIT(14)
+     - fixed a bug in AddTree which caused the Master-Bit to be
+       set for the wrong object
+
+   * mfileio/MReadTree.cc:
+     - return 0 entries if entrie==TChain::kBigNumber
+
+   * msignal/MExtractFixedWindow.cc:
+     - updated output to fitz into a std 80-col console
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -258 +258 @@
 
     TApplication app("Callisto", &argc, argv);
-    if (gROOT->IsBatch() || !gClient)
+    if (!gROOT->IsBatch() && !gClient)
     {
         gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -57 +57 @@
 //  fArgv: A TList containing all other command line arguments
 //
-MArgs::MArgs(int argc, char **argv) : fArgc(argc)
+//  If root==kFALSE all root commandline options are deleted from
+//  the list, namely: -b
+//
+MArgs::MArgs(int argc, char **argv, Bool_t root) : fArgc(argc)
 {
     // FIXME: argv has no const-qualifier to be idetical with
@@ -72 +75 @@
         fArgv->Add(&o);
     }
+
+    if (root)
+        return;
+
+    HasOnlyAndRemove("-b");
 }
 
@@ -408 +416 @@
     const TString name = n.Strip(TString::kBoth);
 
+    Bool_t rc = kFALSE;
+
     TIter Next(fArgv);
     TString *s = NULL;
@@ -414 +424 @@
         {
             delete fArgv->Remove(dynamic_cast<TObject*>(s));
-            return kTRUE;
+            rc = kTRUE;
         }
 
-    return kFALSE;
-}
+    return rc;
+}

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -27 +27 @@
 
 public:
-    MArgs(int argc, char **argv);
+    MArgs(int argc, char **argv, Bool_t root=kFALSE);
     ~MArgs();
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1131 +1131 @@
 void MStatusDisplay::Reset()
 {
+    if (gROOT->IsBatch())
+    {
+        fBatch->Delete();
+        return;
+    }
+
     for (int i=fTab->GetNumberOfTabs()-1; i>0; i--)
         RemoveTab(i);

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -430 +430 @@
     if (calibConv != 0. && calibQE != 0.)
     {
-        const Float_t calibConv2 = calibConv*calibConv;
-        calibConvVar  = calibConvVar/calibConv2 + calibQEVar/(calibQE*calibQE);
-        calibConvVar *= calibConv2;
+        // Now doing:
+        // calibConvVar  = calibConvVar/(calibConv*calibConv) + calibQEVar/(calibQE*calibQE);
+        // calibConvVar *= (calibConv*calibConv);
+        calibConvVar += calibQEVar*(calibConv*calibConv)/(calibQE*calibQE);
     }
 

trunk/MagicSoft/Mars/mfileio/MReadReports.cc

@@ -113 +113 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the number of entries in all trees.
+//
+UInt_t MReadReports::GetEntries()
+{
+    UInt_t n=0;
+
+    TIter NextT(fTrees->GetList());
+    MReadTree *tree=0;
+    while ((tree=(MReadTree*)NextT()))
+        n += tree->GetEntries();
+
+    return n;
+}
+
+// --------------------------------------------------------------------------
+//
+// In case of a Master Tree GetFileName() of the MReadMarsFile is returned.
+// If no master is available "<MReadReports>" is returned.
+//
+TString MReadReports::GetFileName() const
+{
+    if (!TestBit(kHasMaster))
+        return "<MReadReports>";
+
+    TIter NextT(fTrees->GetList());
+    MReadTree *tree=0;
+    while ((tree=(MReadTree*)NextT()))
+        if (tree->InheritsFrom("MReadMarsFile"))
+            return tree->GetFileName();
+
+    return "<n/a>";
+
+}
+
 void MReadReports::AddToBranchList(const char *name)
 {
@@ -150 +186 @@
     t->SetTitle(time?time:"");
     if (master)
-        t->SetBit(kHasMaster);
+        SetBit(kHasMaster);
 
     if (!fEnableAutoScheme)

trunk/MagicSoft/Mars/mfileio/MReadReports.h

@@ -30 +30 @@
     Int_t   FindNextTime();
 
-    UInt_t  GetEntries() { return 0; }
-    TString GetFileName() const { return "<MReadReports>"; };
+    UInt_t  GetEntries();
+    TString GetFileName() const;
 
     Int_t   PreProcess(MParList *plist);
@@ -37 +37 @@
     Int_t   PostProcess();
 
-    //Bool_t  Notify();
-
     enum {
-        //MReadTree::kChainWasChanged = BIT(14)
-        kHasMaster = BIT(15)
+        kHasMaster = BIT(14)
     };
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -566 +566 @@
         ResetBit(kChainWasChanged);
     }
-    return fNumEntries;
+    return fNumEntries==TChain::kBigNumber ? 0 : fNumEntries;
 }
 
@@ -616 +616 @@
     //
     fChain->ResetTree();
+    // Maybe this would be enough, but the above might be safer...
+    //if (fChain->GetTreeNumber()==0)
+    //    fChain->ResetTree();
 
     //

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc

@@ -165 +165 @@
   *fLog << endl;
   *fLog << inf << GetDescriptor() << ": Taking " << fNumHiGainSamples
-        << " HiGain FADC samples from slice: " << (Int_t)fHiGainFirst 
-        << " to (including) slice: " << (Int_t)(fHiGainLast+fHiLoLast) << endl;
+        << " HiGain samples from slice " << (Int_t)fHiGainFirst
+        << " to " << (Int_t)(fHiGainLast+fHiLoLast) << "incl" << endl;
   *fLog << inf << GetDescriptor() << ": Taking " << fNumLoGainSamples
-        << " LoGain FADC samples from slice: " << (Int_t)fLoGainFirst 
-        << " to (including) slice: " << (Int_t)fLoGainLast << endl;
+        << " LoGain samples from slice " << (Int_t)fLoGainFirst
+        << " to " << (Int_t)fLoGainLast << "incl" << endl;
   return kTRUE;