Changeset 1035 for trunk

Timestamp:

11/06/01 13:44:26 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MMcPedestalCopy.cc (modified) (3 diffs)
• manalysis/MMcPedestalCopy.h (modified) (2 diffs)
• mbase/BaseLinkDef.h (modified) (1 diff)
• mbase/MReadMarsFile.cc (added)
• mbase/MReadMarsFile.h (added)
• mbase/MReadTree.cc (modified) (4 diffs)
• mbase/MReadTree.h (modified) (3 diffs)
• mbase/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -43 +43 @@
 
 #include "MPedestalCam.h"
+#include "MRawRunHeader.h"
 #include "MMcFadcHeader.hxx"
 
@@ -58 +59 @@
 Bool_t MMcPedestalCopy::PreProcess(MParList *pList)
 {
-    fMcPedestals = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
-    if (!fMcPedestals)
+    MRawRunHeader *run = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    if (run)
+    {
+        if (run->GetRunType() != kRTMonteCarlo)
+            return kTRUE;
+    }
+
+    const MMcFadcHeader *mcped = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
+    if (!mcped)
     {
         *fLog << dbginf << "MMcFadcHeader not found... aborting." << endl;
@@ -65 +73 @@
     }
 
-    fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
-    if (!fPedestals)
+    MPedestalCam *pedcam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    if (!pedcam)
         return kFALSE;
 
-    return kTRUE;
-}
+    const int num = mcped->GetNumPixel();
 
-Bool_t MMcPedestalCopy::Process()
-{
-    const int num = fMcPedestals->GetNumPixel();
-
-    fPedestals->InitSize(num);
+    pedcam->InitSize(num);
 
     for (int i=0; i<num; i++)
     {
-        MPedestalPix &pix = (*fPedestals)[i];
+        MPedestalPix &pix = (*pedcam)[i];
 
-        const Float_t pedest = fMcPedestals->GetPedestal(i);
-        const Float_t pedrms = fMcPedestals->GetPedestalRms(i);
+        const Float_t pedest = mcped->GetPedestal(i);
+        const Float_t pedrms = mcped->GetPedestalRms(i);
 
         const Float_t sigma  = pedest*sqrt(num);
-        const Float_t sigrms = sigma/sqrt(2*num);
+        const Float_t sigrms = sigma/sqrt(num*2);
 
         pix.SetPedestal(pedest, sigma);
         pix.SetPedestalRms(pedrms, sigrms);
-
-        *fLog << pedest << " " << sigma << " " << pedrms << " " << sigrms << endl;
     }
 

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.h

@@ -23 +23 @@
 class MMcPedestalCopy : public MTask
 {
-    const MMcFadcHeader *fMcPedestals;  //
-          MPedestalCam  *fPedestals;    //
-
-          TString       *fSrc;
+    TString *fSrc;
 
 public:
@@ -32 +29 @@
 
     Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
 
     ClassDef(MMcPedestalCopy, 0)   // Task which copies the pedestals from the MC into the standard container

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -35 +35 @@
 
 #pragma link C++ class MReadTree+;
+#pragma link C++ class MReadMarsFile+;
 
 #pragma link C++ class MRootFileBranch+;

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -54 +54 @@
 #include <fstream.h>
 
+#include <TFile.h>           // TFile::GetName
 #include <TChain.h>
 #include <TGProgressBar.h>
@@ -86 +87 @@
     fVetoList->SetOwner();
 
+    fNotify = new TOrdCollection;
+
     //
     // open the input stream
     //
     fChain = new TChain(tname);
+    fChain->SetNotify(this);
 
     if (fname)
@@ -115 +119 @@
     //
     delete fChain;
+    delete fNotify;
     delete fVetoList;
+}
+
+void MReadTree::SetOwner(Bool_t flag)
+{
+    flag ? fNotify->SetBit(kIsOwner) : fNotify->ResetBit(kIsOwner);
+}
+
+Bool_t MReadTree::Notify()
+{
+    fNotify->ForEach(TObject, Notify)();
+    return kTRUE;
 }
 
@@ -464 +480 @@
     fVetoList->Add(branch);
 }
+
+const char *MReadTree::GetFileName() const
+{
+    return fChain->GetFile()->GetName();
+}
+
+void MReadTree::AddNotify(TObject *obj)
+{
+    fNotify->Add(obj);
+}

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -22 +22 @@
 
     TOrdCollection *fVetoList; // List of Branches which are not allowed to get enabled
+    TOrdCollection *fNotify;   // List of TObjects to notify when switching files
 
     TGProgressBar  *fProgress; // Possible display of status
@@ -32 +33 @@
     void EnableBranchChoosing();
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-  
+    enum { kIsOwner = BIT(14) };
+
 public:
     MReadTree(const char *treename, const char *filename=NULL, const char *name=NULL, const char *title=NULL);
     ~MReadTree();
 
-    Int_t  AddFile(const char *fname);
     void   DisableAutoScheme() { fAutoEnable = kFALSE; }
     void   EnableBranch(const char *name);
@@ -55 +54 @@
     UInt_t GetEntries() const  { return fNumEntries; }
 
+    const char *GetFileName() const;
+
+    virtual void   AddNotify(TObject *obj);
+    virtual void   SetOwner(Bool_t flag=kTRUE);
+
+    virtual Int_t  AddFile(const char *fname);
+
+    virtual Bool_t PreProcess(MParList *pList);
+    virtual Bool_t Process();
+
+    virtual Bool_t Notify();
+
     ClassDef(MReadTree, 0)      // Reads a tree from file(s)
 };

trunk/MagicSoft/Mars/mbase/Makefile

@@ -40 +40 @@
            MEvtLoop.cc \
            MReadTree.cc \
+           MReadMarsFile.cc \
            MWriteFile.cc \
            MWriteAsciiFile.cc \