Changeset 8788 for trunk/MagicSoft/Mars/mjobs

Timestamp:

12/14/07 09:59:26 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (1 diff)
• MJCalibration.cc (modified) (7 diffs)
• MJCalibration.h (modified) (1 diff)
• MJPedestal.cc (modified) (1 diff)
• MJPedestal.h (modified) (1 diff)
• MJStar.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -153 +153 @@
     TObjArray cont;
     cont.Add(const_cast<TEnv*>(GetEnv()));
+    cont.Add(&fSequence);
 
     if (fDisplay)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -188 +188 @@
     : fExtractor(NULL), fTimeExtractor(NULL), 
       fColor(MCalibrationCam::kNONE), fDisplayType(kDataCheckDisplay),
-      fGeometry("MGeomCamMagic")
+      fMinEvents(1000), fGeometry("MGeomCamMagic")
 {
 
   fName  = name  ? name  : "MJCalibration";
   fTitle = title ? title : "Tool to create the calibration constants for one calibration run";
-  
+
   //SetHiLoCalibration();
   SetRelTimeCalibration();
@@ -1521 +1521 @@
     if (!MJCalib::CheckEnvLocal())
         return kFALSE;
-    
+
     SetRelTimeCalibration(GetEnv("RelTimeCalibration", IsRelTimes()));
     SetDebug(GetEnv("Debug", IsDebug()));
@@ -1528 +1528 @@
     SetUsePINDiode(GetEnv("UsePINDiode", IsUsePINDiode()));
     SetGeometry(GetEnv("Geometry", fGeometry));
+
+    fMinEvents = (UInt_t)GetEnv("MinEvents", (Int_t)fMinEvents);
 
     fReferenceFile = GetEnv("ReferenceFile",fReferenceFile.Data());
@@ -1662 +1664 @@
     plist.AddToList(&pedcam);
     plist.AddToList(&fBadPixels);
-        
+
     //
     // Calibration Results containers
@@ -1904 +1906 @@
     {
         *fLog << err << GetDescriptor() << ": Failed." << endl;
+        return kFALSE;
+    }
+
+    if (calcalc.GetNumExecutions()<fMinEvents)
+    {
+        *fLog << err << GetDescriptor() << ": Failed. Less than the required " << fMinEvents << " evts processed." << endl;
         return kFALSE;
     }
@@ -2001 +2009 @@
 
     if (fExtractorCam.GetSize() != 0)
+    {
+        fExtractorCam.SetName("MPedestalExtracted");
         cont.Add(&fExtractorCam);
+    }
 
     TObject *pedcam = plist.FindObject("MPedestalCam");
@@ -2028 +2039 @@
 
     cont.Add(const_cast<TEnv*>(GetEnv()));
+    cont.Add(&fSequence);
 
     return WriteContainer(cont, GetOutputFileName(), "UPDATE");

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -111 +111 @@
   Byte_t fFlags;                                       // Bit-field for the flags
 
+  UInt_t fMinEvents;                                   // Minimum number of events
+
   TString fGeometry;                                   // Class name geometry
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -764 +764 @@
     SetExtractWinRight(GetEnv("ExtractWinRight", fExtractWinRight));
 
-    SetMinEvents(GetEnv("MinEvents", (Int_t)fMinEvents));
+    fMinEvents = (UInt_t)GetEnv("MinEvents", (Int_t)fMinEvents);
 
     if (!MJCalib::CheckEnvLocal())

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -130 +130 @@
     void SetExtractWinRight( const Float_t f=fgExtractWinRight ) { fExtractWinRight = f; }    
 
-    void SetMinEvents(UInt_t min) { fMinEvents = min; }
-
     MExtractor *GetExtractor() const { return fExtractor; }
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -105 +105 @@
     TObjArray cont;
     cont.Add(const_cast<TEnv*>(GetEnv()));
+    cont.Add(&fSequence);
 
     if (fDisplay)
@@ -371 +372 @@
     // Filter to fill the MHMuonPar
     MFDataPhrase fmuon3("(MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation<35) &&"
-                        "(MMuonCalibPar.fArcWidth<0.20) && (MMuonCalibPar.fArcWidth>0.04)",
+                        "(MMuonCalibPar.fArcWidth<0.20) && (MMuonCalibPar.fArcWidth>0.04) &&"
+                        "MMuonCalibPar.fRelTimeSigma<1.5",
                         "MuonFinalCut");
     // Filter to write Muons to Muon tree