Changeset 7560

Timestamp:

03/02/06 13:24:28 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.cc (modified) (1 diff)
• mjobs/MJCut.cc (modified) (7 diffs)
• mjobs/MJCut.h (modified) (2 diffs)
• mjobs/MJPedestal.cc (modified) (6 diffs)
• mjobs/MJPedestal.h (modified) (1 diff)
• mpointing/MSrcPosRndm.cc (added)
• mpointing/MSrcPosRndm.h (added)
• mpointing/Makefile (modified) (1 diff)
• mpointing/PointingLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/03/02 Thomas Bretz
+
+   * callisto.cc:
+     - get result value from pulse pos check
+
+   * mjobs/MJCut.[h,cc]:
+     - added the usage of the new class MSrcPosRndm
+     - added new resource to switch random source position on
+
+   * mjobs/MJPedestal.[h,cc]:
+     - changed return code of Process to int to be able to return
+       the pulse pos check result.
+
+   * mpointing/PointingLinkDef.h, mpointing/Makefile:
+     - added MSrcPosRndm
+
+   * mpointing/MSrcPosRndm.[h,cc]:
+     - added
+
+
+
  2006/03/02 Daniela Dorner
 

trunk/MagicSoft/Mars/callisto.cc

@@ -541 +541 @@
         // Please check the Changelog of 2005/04/20 about further deatils of the next comment
         //if (job1.GetExtractor().InheritsFrom("MExtractTimeAndCharge"))
-        if (!job2.Process())
-        {
+        const Int_t rc = job2.Process();
+        if (rc<=0)
+        {
+            // rc==0:  Error
+            // rc==-1: too much to the left
+            // rc==-2: too much to the right
+            // rc==-3: too much to the right (beyond limits)
+
             gLog << err << "Calculation of pedestal from extrtactor (random) failed." << endl << endl;
             return 2;

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -55 +55 @@
 #include "MTaskEnv.h"
 #include "MPointingDevCalc.h"
+#include "MSrcPosRndm.h"
 #include "MSrcPosCalc.h"
 #include "MSrcPosCorrect.h"
@@ -72 +73 @@
 #include "MPointingPos.h"
 #include "MObservatory.h"
+#include "MHSrcPosCam.h"
 
 ClassImp(MJCut);
@@ -427 +429 @@
 }
 
-Bool_t MJCut::FillSrcPosCam(const MDataSet &set, MPointingPos &source)
+Bool_t MJCut::FillSrcPosCam(const MDataSet &set, MPointingPos &source, MHSrcPosCam &hsrcpos)
 {
     *fLog << inf;
@@ -467 +469 @@
     set.AddFilesOn(read);
 
-    MFillH fill("MHSrcPosCam", "MSrcPosCam", "FillSrcPosCam");
+    MFillH fill(&hsrcpos, "MSrcPosCam", "FillSrcPosCam");
     fill.SetNameTab("SrcPos");
 
     // How to get source position from off- and on-data?
     MSrcPosCorrect scor;
-    MSrcPosCalc scalc;
+    MSrcPosCalc    scalc;
     scalc.SetMode(MSrcPosCalc::kDefault);
 
@@ -538 +540 @@
         *fLog << all << "No source position applied..." << endl;
 
+    MParList plist;
+
+    MHSrcPosCam hsrcpos;
     if (!fIsWobble && source.IsInitialized() && fRndmSrcPos)
-        if (!FillSrcPosCam(set, source))
+    {
+        if (!FillSrcPosCam(set, source, hsrcpos))
             return kFALSE;
+        plist.AddToList(&hsrcpos);
+    }
 
     // --------------------------------------------------------------------------------
@@ -552 +560 @@
 
     // Setup Parlist
-    MParList plist;
     plist.AddToList(this); // take care of fDisplay!
 
@@ -679 +686 @@
     hcalc2.SetNameSrcPosCam("MSrcPosAnti");
 
+    MSrcPosRndm srcrndm;
+
     MTaskList tlist2;
     tlist2.AddToList(&scalc);
     tlist2.AddToList(&scor);
+    tlist2.AddToList(&srcrndm);
     tlist2.AddToList(&hcalc);
     if (fIsWobble)

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -13 +13 @@
 class MWriteRootFile;
 class MPointingPos;
+class MHSrcPosCam;
 
 class MJCut : public MJob
@@ -48 +49 @@
     Bool_t   CanStoreResult() const  { return !fPathOut.IsNull() && fStoreResult;  }
 
-    Bool_t   FillSrcPosCam(const MDataSet &set, MPointingPos &source);
+    Bool_t   FillSrcPosCam(const MDataSet &set, MPointingPos &source, MHSrcPosCam &srcpos);
 
 public:

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -843 +843 @@
 }
 
-Bool_t MJPedestal::PulsePosCheck(const MParList &plist) const
+Int_t MJPedestal::PulsePosCheck(const MParList &plist) const
 {
     if (fIsPixelCheck)
@@ -951 +951 @@
     {
         *fLog << err << "Pulse is too much to the left, cannot go below 0!" << endl;
-        return kFALSE;
+        return -1;
 
     }
@@ -959 +959 @@
         *fLog << numhigainsamples << "+" << numlogainsamples << "-1" << endl;
         *fLog << " Cannot extract at all!" << endl;
-        return kFALSE;
+        return -3;
     }
     if (newlast+wslogain > numlogainsamples)
@@ -970 +970 @@
         *fLog << "(ATTENTION, you will lose late cosmics pulses!)" << endl;
         *fLog << endl;
-        return kFALSE;
+        return -2;
     }
 
@@ -986 +986 @@
 }
 
-Bool_t MJPedestal::Process()
+Int_t MJPedestal::Process()
 {
     if (!fSequence.IsValid())
@@ -1271 +1271 @@
         return kFALSE;
 
-    if (!PulsePosCheck(plist))
-        return kFALSE;
+    const Int_t rc = PulsePosCheck(plist);
+    if (rc<1)
+        return rc;
 
     *fLog << all << GetDescriptor() << ": Done." << endl;

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -104 +104 @@
     const Bool_t IsUseData() const { return fExtractType == kUseData; }
 
-    Bool_t Process();
+    Int_t Process();
 
     void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }

trunk/MagicSoft/Mars/mpointing/Makefile

@@ -32 +32 @@
            MSrcPosCam.cc \
            MSrcPosCalc.cc \
+           MSrcPosRndm.cc \
            MSrcPosCorrect.cc \
            MSrcPosFromModel.cc

trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MSrcPosCam+;
 #pragma link C++ class MSrcPosCalc+;
+#pragma link C++ class MSrcPosRndm+;
 #pragma link C++ class MSrcPosCorrect+;
 #pragma link C++ class MSrcPosFromModel+;