Changeset 8371

Timestamp:

03/05/07 15:55:08 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto_mux.rc (modified) (2 diffs)
• mjobs/MSequence.cc (modified) (3 diffs)
• mpedestal/MExtractPedestal.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/callisto_mux.rc

@@ -77 +77 @@
 MJPedestalC1.ExtractSignal.HiGainFirst:        15
 MJPedestalC1.ExtractSignal.HiGainLast:         64
-#MJPedestalC1.ExtractSignal.LoGainFirst:         3
-#MJPedestalC1.ExtractSignal.LoGainLast:         14
+#MJPedestalC1.ExtractSignal.LoGainFirst:         0
+#MJPedestalC1.ExtractSignal.LoGainLast:          0
 MJPedestalC1.ExtractSignal.SaturationLimit:   252
 #MJPedestalC1.ExtractSignal.OffsetLoGain:     1.51
@@ -421 +421 @@
 #MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
 #MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    3
-#MJCalibrateSignal.MBadPixelsTreat.MaxArrivalTimeDiff: 1.0
+MJCalibrateSignal.MBadPixelsTreat.MaxArrivalTimeDiff: 6.0
 #MJCalibrateSignal.MBadPixelsTreat.UseInterpolation:   yes
 #MJCalibrateSignal.MBadPixelsTreat.ProcessPedestalEvt: yes

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -225 +225 @@
         case kRawAll:
             d += "rawfiles/";
-            d += fNight.GetStringFmt("%Y/%m/%d/");
+            d += fNight.GetStringFmt("%Y/%m/%d");
             break;
         case kRootDat:
@@ -232 +232 @@
         case kRootAll:
             d += "merpp/";
-            d += fNight.GetStringFmt("%Y/%m/%d/");
+            d += fNight.GetStringFmt("%Y/%m/%d");
             break;
         case kCalibrated:
-            d += Form("callisto/%04d/%08d/", fSequence/10000, fSequence);
+            d += Form("callisto/%04d/%08d", fSequence/10000, fSequence);
             break;
         case kImages:
-            d += Form("star/%04d/%08d/", fSequence/10000, fSequence);
+            d += Form("star/%04d/%08d", fSequence/10000, fSequence);
             break;
         }
@@ -244 +244 @@
     else
         gSystem->ExpandPathName(d);
+
+    if (!d.EndsWith("/"))
+        d += '/';
 
     for (int i=0; i<arr.GetSize(); i++)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.27 2007-03-03 22:27:50 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.28 2007-03-05 15:54:55 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -401 +401 @@
   fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber(fNameRawEvtData));
   if (!fRawEvt)
-      if (!fUseSpecialPixels)
-      {
-          *fLog << err << AddSerialNumber(fNameRawEvtData) << " not found... aborting." << endl;
-          return kFALSE;
-      }
-
-
-  fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
-  if (!fRawEvt)
   {
-      *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl;
+      *fLog << err << AddSerialNumber(fNameRawEvtData) << " not found... aborting." << endl;
       return kFALSE;
   }
-  
+
   fRunHeader = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
   if (!fRunHeader)
@@ -581 +572 @@
 
         SetRangeFromExtractor(*fExtractor);
-        /*
-        // If an extractor is set determin the window size automatically!
-        fExtractWinFirst = fExtractor->GetHiGainFirst();
-        fExtractWinLast  = fExtractor->GetHiGainLast();
-
-        if (!fExtractor->HasLoGain())
-        {
-            fCheckWinFirst=fExtractWinFirst;
-            fCheckWinLast =fExtractWinLast;
-        }*/
+
         // fSignal->GetNumSamples() not yet initialized!!!
-        const UInt_t num = fRunHeader->GetNumSamplesHiGain()+fRunHeader->GetNumSamplesLoGain();
+        const UInt_t num = fRunHeader->GetNumSamples();
         if (fExtractWinLast >= num)
         {
-            *fLog << err << GetDescriptor();
-            *fLog << " - ERROR: Selected fExtractWinLast " << fExtractWinLast;
+            *fLog << err;
+            *fLog << "ERROR - Selected fExtractWinLast " << fExtractWinLast;
             *fLog << " out of range (>=" << num<< ")." << endl;
             return kFALSE;
         }
     }
+    else
+        if (fRunHeader->GetNumSamplesLoGain()==0 && (fCheckWinFirst!=0 || fCheckWinLast!=0))
+        {
+            *fLog << inf << "Data has no lo-gains... resetting check window to extraction window." << endl;
+            SetCheckRange(fExtractWinFirst, fExtractWinLast);
+        }
 
     //CheckExtractionWindow();