Changeset 7194

Timestamp:

07/15/05 13:25:57 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• macros/dohtml.C (modified) (1 diff)
• mcalib/MCalibrationCam.h (modified) (1 diff)
• mcalib/MCalibrationPattern.h (modified) (1 diff)
• mcalib/MCalibrationPatternDecode.cc (modified) (1 diff)
• mhflux/MHThetaSq.cc (modified) (1 diff)
• msignal/MC_calibration_weights_UV46.dat (added)
• msignal/MC_cosmics_weights46.dat (added)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (16 diffs)
• msignal/MExtractTimeAndChargeDigitalFilter.h (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/07/16 Thomas Bretz
+
+   * macros/dohtml.C:
+     - some updates to the macro section
+
+   * mcalib/MCalibrationCam.h:
+     - added new member function GetPulserColorStr to convert
+       pulser color into string
+
+   * mcalib/MCalibrationPattern.h:
+     - added new member function GetPulserColorStr to return
+       pulser color a string
+
+   * mcalib/MCalibrationPatternDecode.cc:
+     - fixed a typo in a comment
+
+   * mhflux/MHThetaSq.cc:
+     - set default number of bins to 75
+
+   * msignal/MExtractTimeAndChargeDigitalFilter.[h,cc]:
+     - updated support for automatic weights. All cases should now
+       be handled as accurate as possible.
+
+   * msignal/MC_calibration_weights_UV46.dat,
+     msignal/MC_cosmics_weights46.dat:
+     - new files
+
+
+
  2005/07/14 Thomas Bretz
 

trunk/MagicSoft/Mars/NEWS

@@ -48 +48 @@
        - fgLoGainBlackoutLimit: 3.5
        - fgLoGainPickupLimit: 3.5
+
+   - callisto: The handling of automatic weights for the digital filter 
+     has been improved. There are now new calibration weights special
+     for Monte Carlo calibrations.
 
    - callisto: use a new criterium to exclude bad pixels: If the high-gain

trunk/MagicSoft/Mars/macros/dohtml.C

@@ -101 +101 @@
     html.SetSourceDir("macros");
     html.Convert("merpp.C",         "MARS - Merging and Preprocessing");
-    html.Convert("readraw.C",       "MARS - How To Read A Raw");
+    html.Convert("tutorials/readraw.C",       "MARS - How To Read A Raw");
     html.Convert("rootlogon.C",     "MARS - rootlogon.C");
-    html.Convert("readCT1.C",       "MARS - Read and display CT1 Events");
+    //html.Convert("readCT1.C",       "MARS - Read and display CT1 Events");
     html.Convert("readMagic.C",     "MARS - Read and display Magic Events");
-    html.Convert("CT1Hillas.C",     "MARS - Calculate CT1 Hillas");
+    //html.Convert("CT1Hillas.C",     "MARS - Calculate CT1 Hillas");
     html.Convert("MagicHillas.C",   "MARS - Calculate Magic Hillas");
-    html.Convert("collarea.C",      "MARS - Calculate Collection Area from a MC root file");
+//?    html.Convert("collarea.C",      "MARS - Calculate Collection Area from a MC root file");
     html.Convert("threshold.C",     "MARS - Calculate Energy Threshold from a MC root file");
     html.Convert("trigrate.C",      "MARS - Calculate Trigger Rate from a MC root file");
     html.Convert("star.C",          "MARS - (St)andard (A)nalysis and (R)econstruction");
-    html.Convert("starplot.C",      "MARS - Plot parameters from file created with star.C");
+    html.Convert("tutorials/starplot.C",      "MARS - Plot parameters from file created with star.C");
+    html.Convert("tutorials/readrfl.C",      "MARS - Example of reading reflector output with Mars");
     html.Convert("comprob.C",       "MARS - Calculation of composite probabilities for G/H-Seperation");
     html.Convert("multidimdist.C",  "MARS - Calculation of multidimensional distances for G/H-Seperation");
     html.Convert("multidimdist2.C", "MARS - Calculation of multidimensional distances for G/H-Seperation");
-    html.Convert("estimate.C",      "MARS - Shows results from the energy estimation");
-    html.Convert("estfit.C",        "MARS - Fits the coefficients of the energy estimator MEnergyEstParam");
-    html.Convert("plot.C",          "MARS - Plots 1D mars histogram");
-    html.Convert("plot2.C",         "MARS - Plots a 2D mars histogram");
-    html.Convert("starplot.C",      "MARS - Plots data from a STAR-file into a mars histogram");
-    html.Convert("testenv.C",       "MARS - Example to use TEnv and Mars Eventloops");
+//    html.Convert("estimate.C",      "MARS - Shows results from the energy estimation");
+//    html.Convert("estfit.C",        "MARS - Fits the coefficients of the energy estimator MEnergyEstParam");
+    html.Convert("tutorials/plot.C",          "MARS - Plots 1D mars histogram");
+    html.Convert("tutorials/plot2.C",         "MARS - Plots a 2D mars histogram");
+    html.Convert("tutorials/testenv.C",       "MARS - Example to use TEnv and Mars Eventloops");
     html.Convert("triglvl2.C",      "MARS - Example to use MMcTriggerLvl2 class, using filters and creating histograms");
-    html.Convert("status.C",        "MARS - Example to use the online display");
-    html.Convert("calibration.C",   "MARS - Example to use the calibration");
-    html.Convert("pedvsevent.C",    "MARS - Example to use MPedCalcPedRun");
-    html.Convert("pedphotcalc.C",   "MARS - Example to use MPedPhotCalc");
-    html.Convert("sectorvstime.C",  "MARS - Example how to plot mean value of a camera sector versus time");
-    html.Convert("calibration.C",   "MARS - Example how to use the calibrationa camera ");
-    html.Convert("bootcampstandardanalysis.C", "MARS - Example of the status of the standard analysis at the bootcamp");
+    //html.Convert("status.C",        "MARS - Example to use the online display");
+    //html.Convert("calibration.C",   "MARS - Example to use the calibration");
+    html.Convert("tutorials/pedvsevent.C",    "MARS - Example to use MPedCalcPedRun");
+    //html.Convert("pedphotcalc.C",   "MARS - Example to use MPedPhotCalc");
+    html.Convert("tutorials/derotatedc.C",  "MARS - Example of plotting derotated dc currents");
+    html.Convert("tutorials/evtrate.C",  "MARS - Example how to plot the event rate");
+    html.Convert("tutorials/pixvsevent.C",  "MARS - Example how to plot pixel value versus event number/time");
+    html.Convert("tutorials/sectorvstime.C",  "MARS - Example how to plot mean value of a camera sector versus time");
+    html.Convert("tutorials/pedestalvstime.C",  "MARS - Example how to plot pedestal/rms versus time");
+    html.Convert("tutorials/pixfirerate.C",  "MARS - Example how to plot the firerate of a pixel (times above threshold)");
+    html.Convert("tutorials/pixsatrate.C",  "MARS - Example how to plot the saturation rate of a pixel");
+    //html.Convert("calibration.C",   "MARS - Example how to use the calibrationa camera ");
+    //html.Convert("bootcampstandardanalysis.C", "MARS - Example of the status of the standard analysis at the bootcamp");
     html.Convert("readIPR.C",       "MARS - Example to read and display the IPRs from a (merpped) report file");
-    html.Convert("extendcam.C",     "MARS - Example of using MGeomCamExtend and MHexagonalFTCalc");
-    html.Convert("hft.C",           "MARS - Example of using MHexagonalFTCalc");
+    html.Convert("tutorials/extendcam.C",     "MARS - Example of using MGeomCamExtend and MHexagonalFTCalc");
+    html.Convert("tutorials/hft.C",           "MARS - Example of using MHexagonalFTCalc");
 }

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -94 +94 @@
   const MCalibrationPix &operator[]             ( UInt_t i )           const;
 
+  static TString GetPulserColorStr(PulserColor_t col) {
+      TString str;
+      switch (col)
+      {
+      case kCT1:   str += "CT1";      break;
+      case kGREEN: str += "Green";    break;
+      case kBLUE:  str += "Blue";     break;
+      case kUV:    str += "UV";       break;
+      case kNONE:  str += "None";     break;
+      default:     str += "Unknown";  break;
+      }
+      str += " (";
+      str += (int)col;
+      str += ")";
+      return str;
+  }
+
   // Inits
   void  Init                   ( const MGeomCam &geom         );

trunk/MagicSoft/Mars/mcalib/MCalibrationPattern.h

@@ -54 +54 @@
 
     const MCalibrationCam::PulserColor_t GetPulserColor() const { return fPulserColor; }
+    TString GetPulserColorStr() const { return MCalibrationCam::GetPulserColorStr(fPulserColor); }
 
     void SetPulserColor   ( const MCalibrationCam::PulserColor_t col) { fPulserColor = col; }

trunk/MagicSoft/Mars/mcalib/MCalibrationPatternDecode.cc

@@ -99 +99 @@
 Int_t MCalibrationPatternDecode::Process()
 {
-    // No setting necessary because MCalibrationPattern::reset() has
+    // No setting necessary because MCalibrationPattern::Reset() has
     // been called just before
     if (fRunHeader->GetFormatVersion()<5)

trunk/MagicSoft/Mars/mhflux/MHThetaSq.cc

@@ -62 +62 @@
 //
 MHThetaSq::MHThetaSq(const char *name, const char *title)
-    : MHAlpha(name, title), fThetaSq(0), fNumBinsSignal(3), fNumBinsTotal(45)
+    : MHAlpha(name, title), fThetaSq(0), fNumBinsSignal(3), fNumBinsTotal(75)
 {
     //

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -70 +70 @@
 #include "MRawRunHeader.h"
 #include "MCalibrationPattern.h"
+#include "MExtractedSignalCam.h"
 
 #include "MPedestalPix.h"
@@ -142 +143 @@
   if (fWindowSizeHiGain > availhirange)
   {
-      // Please simplify this!
-      *fLog << warn << GetDescriptor() 
-            << Form("%s%2i%s%2i%s%2i%s",": Hi Gain window size: ",fWindowSizeHiGain,
-                    " is bigger than available range: [",(int)fHiGainFirst,",",(int)fHiGainLast,"]") << endl;
+      *fLog << warn << GetDescriptor() << ": Hi Gain window size: " << Form("%2i",fWindowSizeHiGain);
+      *fLog << " is bigger than available range: [" << Form("%2i", (int)fHiGainFirst);
+      *fLog << "," << Form("%21", (int)fHiGainLast) << "]" << endl;
+
       fHiGainLast = fHiGainFirst + fWindowSizeHiGain;
-      *fLog << warn << GetDescriptor() 
-            << ": Will set the upper range to: " << (int)fHiGainLast << endl;
+
+      *fLog << warn << GetDescriptor() << ": Will set the upper range to: " << (int)fHiGainLast << endl;
     }
   
@@ -163 +164 @@
       if (fWindowSizeLoGain > availlorange)
         {
-      // Please simplify this!
-          *fLog << warn << GetDescriptor() 
-                << Form("%s%2i%s%2i%s%2i%s",": Lo Gain window size: ",fWindowSizeLoGain,
-                        " is bigger than available range: [",(int)fLoGainFirst,",",(int)fLoGainLast,"]") << endl;
-          fLoGainLast = fLoGainFirst + fWindowSizeLoGain;
-          *fLog << warn << GetDescriptor() 
-            << ": Will set the upper range to: " << (int)fLoGainLast << endl;
+            *fLog << warn << GetDescriptor() << ": Lo Gain window size: " << Form("%2i",fWindowSizeLoGain);
+            *fLog << " is bigger than available range: [" << Form("%2i", (int)fLoGainFirst);
+            *fLog << "," << Form("%21", (int)fLoGainLast) << "]" << endl;
+
+            fLoGainLast = fLoGainFirst + fWindowSizeLoGain;
+
+            *fLog << warn << GetDescriptor() << ": Will set the upper range to: " << (int)fLoGainLast << endl;
         }
       
@@ -205 +206 @@
 // --------------------------------------------------------------------------
 //
-// InitArrays
-//
-// Gets called in the ReInit() and initialized the arrays
-//
-Bool_t MExtractTimeAndChargeDigitalFilter::InitArrays()
-{
-    if (!fRunHeader)
+// The weights are determined using GetAutimaticWeights().
+//
+// kFALSE is returned if it returned an error.
+// kTRUE  is returned if no new weights were set.
+//
+// If new weights are set
+//  fTimeShiftHiGain
+//  fTimeShiftLoGain
+//  fNumHiGainSamples
+//  fNumLoGainSamples
+//  fSqrtHiGainSamples
+//  fSqrtLoGainSamples
+// and
+//  fSignals->SetUsedFADCSlices(...)
+// is updated accordingly.
+//
+Bool_t MExtractTimeAndChargeDigitalFilter::GetWeights()
+{
+    switch (GetAutomaticWeights())
+    {
+    case kERROR: // An error occured
         return kFALSE;
-
-    const Int_t rangehi = (Int_t)(fHiGainLast - fHiGainFirst + 1 + fHiLoLast);
-    const Int_t rangelo = (Int_t)(fLoGainLast - fLoGainFirst + 1);
-
-    fHiGainSignal.Set(rangehi);
-    fLoGainSignal.Set(rangelo);
-
-    // Try to get automatic weights
-    if (!ReadAutomaticWeightsFile())
-        return kFALSE;
-
-    // If still no weights set try conservative way
-    if (fNameWeightsFileSet.IsNull())
-        if (!ReadWeightsFile(fNameWeightsFile))
-            return kFALSE;
-
-    fTimeShiftHiGain = (Float_t)fHiGainFirst + 0.5 + 1./fBinningResolutionHiGain;
+    case kFALSE: // No new weights set
+        return kTRUE;
+    }
+
+    // New weights set
+    fTimeShiftHiGain = 0.5 + 1./fBinningResolutionHiGain + fHiGainFirst;
     fTimeShiftLoGain = 0.5 + 1./fBinningResolutionLoGain;
+
     //
     // We need here the effective number of samples which is about 2.5 in the case of a window
@@ -240 +245 @@
     fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);
 
+    // From MExtractTimeAndCharge::ReInit
+    if (fSignals)
+        fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainLast+fHiLoLast, fNumHiGainSamples,
+                                    fLoGainFirst, fLoGainLast, fNumLoGainSamples);
     return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// InitArrays
+//
+// Gets called in the ReInit() and initialized the arrays
+//
+Bool_t MExtractTimeAndChargeDigitalFilter::InitArrays()
+{
+    if (!fRunHeader)
+        return kFALSE;
+
+    const Int_t rangehi = (Int_t)(fHiGainLast - fHiGainFirst + 1 + fHiLoLast);
+    const Int_t rangelo = (Int_t)(fLoGainLast - fLoGainFirst + 1);
+
+    fHiGainSignal.Set(rangehi);
+    fLoGainSignal.Set(rangelo);
+
+    return GetWeights();
+}
+
+// --------------------------------------------------------------------------
+//
+// Check if reading a new weights file is necessary because the calibration
+// pattern has changed. (Cannot be done in ReInit, because at this time
+// the calibration pattern is not available.
+// Then process the event.
+//
+Int_t MExtractTimeAndChargeDigitalFilter::Process()
+{
+    // Change Weights if the calibration patter changes
+    if (!GetWeights())
+        return kERROR;
+
+    // Process event
+    return MExtractTimeAndCharge::Process();
 }
 
@@ -643 +689 @@
 //----------------------------------------------------------------------------
 //
+// If automatic weights are requested, no default weights (name.IsNull())
+// are requested, fRunHeader is available and fRunHeader->IsMonteCarloRun()
+// is true prepend "MC_" in from of the name.
+//
+// return poth+name;
+//
+TString MExtractTimeAndChargeDigitalFilter::CompileWeightFileName(TString path, const TString &name) const
+{
+    if (fAutomaticWeights && !name.IsNull() && fRunHeader && fRunHeader->IsMonteCarloRun())
+        path += "MC_";
+
+    path += name;
+
+    return path;
+}
+
+//----------------------------------------------------------------------------
+//
 // Read a pre-defined weights file into the class. 
 // This is mandatory for the extraction
@@ -648 +712 @@
 // If filenname is empty, then all weights will be set to 1.
 //
-Bool_t MExtractTimeAndChargeDigitalFilter::ReadWeightsFile(TString filename)
-{
-  
-    // This is a fix for TEnv files edited with windows editors
-    filename.ReplaceAll("\015", "");
-
-    fAmpWeightsHiGain .Set(fBinningResolutionHiGain*fWindowSizeHiGain);
-    fAmpWeightsLoGain .Set(fBinningResolutionLoGain*fWindowSizeLoGain);
-    fTimeWeightsHiGain.Set(fBinningResolutionHiGain*fWindowSizeHiGain);
-    fTimeWeightsLoGain.Set(fBinningResolutionLoGain*fWindowSizeLoGain);
-
-    if (fNameWeightsFile.IsNull() || fNameWeightsFile=="-")
-    {
+// Returns:
+//  kTRUE:  new weights set
+//  kFALSE: no  weights set
+//  kERROR: error
+//
+Int_t MExtractTimeAndChargeDigitalFilter::ReadWeightsFile(TString filename, TString path)
+{
+    if (filename.IsNull())
+    {
+        fAmpWeightsHiGain .Set(fBinningResolutionHiGain*fWindowSizeHiGain);
+        fAmpWeightsLoGain .Set(fBinningResolutionLoGain*fWindowSizeLoGain);
+        fTimeWeightsHiGain.Set(fBinningResolutionHiGain*fWindowSizeHiGain);
+        fTimeWeightsLoGain.Set(fBinningResolutionLoGain*fWindowSizeLoGain);
+
         fAmpWeightsHiGain.Reset(1);
         fTimeWeightsHiGain.Reset(1);
         fAmpWeightsLoGain.Reset(1);
         fTimeWeightsLoGain.Reset(1);
-        fNameWeightsFileSet = "-";
         return kTRUE;
     }
 
+    // Add "MC_" in front of the filename if necessary
+    filename = CompileWeightFileName(path, filename);
+
     //filename = MJob::ExpandPath(filename);
 
     if (fNameWeightsFileSet==filename)
-        return kTRUE;
+        return kFALSE; // No file read
 
     ifstream fin(filename.Data());
@@ -679 +746 @@
         *fLog << err << GetDescriptor() << ": ERROR - Cannot open file " << filename << ": ";
         *fLog << strerror(errno) << endl;
-        return kFALSE;
-    }
-
-    *fLog << all << "DigitalFilter: Reading weights in " << filename << "..." << flush;
+        return kERROR;
+    }
+
+    *fLog << all << GetDescriptor() << ": Reading weights in " << filename << "..." << flush;
 
     Int_t len = 0;
@@ -705 +772 @@
             {
                 *fLog << err << "ERROR - 'High Gain Weights' found twice in line #" << line << "." << endl;
-                return kFALSE;
+                return kERROR;
             }
 
@@ -712 +779 @@
                 *fLog << err << "ERROR - Wrong number of arguments in line #" << line << ":" << endl;
                 *fLog << str << endl;
-                return kFALSE;
+                return kERROR;
             }
 
@@ -727 +794 @@
             {
                 *fLog << err << "ERROR - 'Lo Gain Weights' found twice in line #" << line << "." << endl;
-                return kFALSE;
+                return kERROR;
             }
 
@@ -734 +801 @@
                 *fLog << err << "ERROR - Wrong number of arguments in line #" << line << ":" << endl;
                 *fLog << str << endl;
-                return kFALSE;
+                return kERROR;
             }
 
@@ -758 +825 @@
             *fLog << err << "ERROR - Wrong number of arguments in line #" << line << ":" << endl;
             *fLog << str << endl;
-            return kFALSE;
+            return kERROR;
         }
 
@@ -770 +837 @@
     if (cnt != len)
     {
-        *fLog << err << "Size mismatch in weights file " << filename << endl;
-        return kFALSE;
+        *fLog << err << "ERROR - Size mismatch in weights file " << filename << endl;
+        return kERROR;
     }
 
     if (!hi)
     {
-        *fLog << err << "No correct header found in weights file " << filename << endl;
-        return kFALSE;
+        *fLog << err << "ERROR - No correct header found in weights file " << filename << endl;
+        return kERROR;
     }
 
@@ -824 +891 @@
 //----------------------------------------------------------------------------
 //
-// If automatic weight disabled or run type is pedestal no action is taken
-// and kTRUE is returned.
-// 
-// Otherwise:
-//  - If runtype is kRTData and filename starts with "MC_weights" "MC" is
-//    replaced by "cosmics"
-//  - If runtype is kRTMonteCarlo and filename starts with "cosmics_weights"
-//    "cosmics" is replaced by "MC"
-//  - If name filename begins with "calibration_weights_" for blue and green
-//    "UV" is replaced by "blue"
-//  - If name filename begins with "calibration_weights_" for UV and CT1
-//    "blue" is replaced by "UV"
-//
-// The replacements are done in this order. If no match is found no
-// replacement is done. Afterwards ReadWeightsFile for the resulting
-// path-/filename is called.
-//
-Bool_t MExtractTimeAndChargeDigitalFilter::ReadAutomaticWeightsFile()
-{
-    if (!fAutomaticWeights || fRunHeader->GetRunType()==MRawRunHeader::kRTPedestal)
-        return kTRUE;
-
-    if (fNameWeightsFile.IsNull())
-    {
-        *fLog << err << "ERROR - Cannot get automatic weights without default filename." << endl;
-        return kFALSE;
-    }
-
-    *fLog << dbg << endl;
-    *fLog << underline << GetDescriptor() << endl;
-    *fLog << " Trying to get automatic weight for " << fNameWeightsFile << endl;
-
+// The default (+ prepending possible "MC_") is read for:
+//
+//   - RunType: Pedestal (independant of fAutomaticWeights)
+//   - fAutomaticWeights disabled
+//
+//  if fAutomaticWeights enabled:
+//   - fNameWeightsFile.IsNull()
+//   - !fCalibPattern
+//   - fCalibPattern->GetPulserColor()==MCalibrationCam::kNONE
+//
+// If automatic weights are enabled, the case above didn't take place and
+// fNameWeightsFile starts with "calibration_weights_"
+//   - the color (blue, UV) is replaced by the appropriate one
+//     taken from the calibration pattern
+//
+// In most cases a debug output is printed. Further output about the color
+// determination can be switched on with debug level > 5;
+//
+// Returns:
+//  kFALSE: No new weights set
+//  kTRUE:  New weights set
+//  kERROR: Error
+//
+Int_t MExtractTimeAndChargeDigitalFilter::GetAutomaticWeights()
+{
     const Ssiz_t pos = fNameWeightsFile.Last('/')+1;
     const Ssiz_t len = fNameWeightsFile.Length();
 
+    // Split file name in path and name
     TString path = fNameWeightsFile(0, pos>=0?pos:len);
     TString name = fNameWeightsFile(pos>=0?pos:0, len);
 
-    if (name.BeginsWith("cosmics_weights") && fRunHeader->GetRunType()==MRawRunHeader::kRTMonteCarlo)
-    {
-        name.Remove(0, 7);
-        name.Prepend("MC");
-        *fLog << "Run type: Monte Carlo data" << endl;
-    }
-    if (name.BeginsWith("MC_weights") && fRunHeader->GetRunType()==MRawRunHeader::kRTData)
-    {
-        name.Remove(0, 2);
-        name.Prepend("cosmics");
-        *fLog << "Run type: Cosmics data" << endl;
+    // Remove trailing "MC_" for automatic weights
+    if (fAutomaticWeights && name.BeginsWith("MC_"))
+        name.Remove(0, 3);
+
+    // In case of a pedetsal run no calibration pattern can be available
+    // the default weights are always used.
+    if (fRunHeader->GetRunType()==MRawRunHeader::kRTPedestal)
+    {
+        *fLog << dbg << "Pedestal file... using default weights: " << fNameWeightsFile << endl;
+        return ReadWeightsFile(name, path);
+    }
+
+    // If automatic weights are switched off use default weights
+    if (!fAutomaticWeights)
+    {
+        *fLog << dbg << "Automatic weights switched off... using default weights: " << fNameWeightsFile << endl;
+        return ReadWeightsFile(name, path);
+    }
+
+    // If automatic weights are switched on but no filename is given raise error
+    if (fNameWeightsFile.IsNull())
+    {
+        *fLog << err << "ERROR - Cannot get automatic weights without default filename." << endl;
+        return kERROR;
+    }
+
+    // If this is no pedestal run, automatic weights are requested and a
+    // filename for the weights file is given pedestal-extraction from
+    // cosmics data is assumed.
+    if (!fCalibPattern)
+    {
+        *fLog << dbg << "No decoded calibration pattern available... using default weights: " << fNameWeightsFile << endl;
+        return ReadWeightsFile(name, path);
+    }
+
+    const Bool_t debug = gLog.GetDebugLevel()>5;
+
+    // If no calibration pattern is available do not change the
+    // current weighs or current weights file name.
+    if (fCalibPattern->GetPulserColor()==MCalibrationCam::kNONE)
+    {
+        // If we are extracting data and the calibration pattern is kNONE
+        // we assume that it is a data file without interleaved events
+        // and calibration pattern information available.
+        if ((fRunHeader->GetRunType()!=MRawRunHeader::kRTData && !fRunHeader->IsMonteCarloRun()) || debug)
+            *fLog << dbg << "No calibration color set so far... guessing default: " << fNameWeightsFile << endl;
+
+        return ReadWeightsFile(name, path);
+    }
+
+    if (debug)
+    {
+        *fLog << dbg << endl;
+        *fLog << underline << GetDescriptor() << endl;
+        *fLog << " Trying to get automatic weight for " << fNameWeightsFile << endl;
+        *fLog << " Run type: ";
     }
 
     if (name.BeginsWith("calibration_weights_") && fCalibPattern)
     {
-        *fLog << " Run type: Calibration with color " << (int)fCalibPattern->GetPulserColor() << ", setting ";
+        if (debug)
+            *fLog << " Calibration with color " << fCalibPattern->GetPulserColorStr() << ", setting ";
         switch (fCalibPattern->GetPulserColor())
         {
         case MCalibrationCam::kBLUE:  // 2
         case MCalibrationCam::kGREEN: // 1
-            *fLog << "blue/green" << endl;
+            if (debug)
+                *fLog << "blue/green, ";
             name.ReplaceAll("UV", "blue");
             break;
@@ -888 +996 @@
         case MCalibrationCam::kUV:    // 3
         case MCalibrationCam::kCT1:   // 0
-            *fLog << "UV/CT1" << endl;
+            if (debug)
+                *fLog << "UV/CT1, ";
             name.ReplaceAll("blue", "UV");
             break;
         case MCalibrationCam::kNONE:
-            *fLog << "None" << endl;
             break;
-        default: // kNONE=4
-            *fLog << "???" << endl;
-        }
-    }
-
-    path += name;
-
-    return ReadWeightsFile(path);
+        default: // kNone + etc
+            *fLog << err << "ERROR - Cannot get automatic weights for " << fCalibPattern->GetPulserColorStr() << endl;
+            return kERROR;
+        }
+    }
+
+    return ReadWeightsFile(name, path);
 }
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

@@ -69 +69 @@
   // MExtractTimeAndChargeDigitalFilter
   void    CalcBinningResArrays();
-  Bool_t  ReadAutomaticWeightsFile();
+  Int_t   GetAutomaticWeights();
+  Bool_t  GetWeights();
+  Int_t   ReadWeightsFile(TString filename, TString path="");
+  TString CompileWeightFileName(TString path, const TString &name) const;
 
   // MExtractTimeAndCharge
@@ -76 +79 @@
   // MTask
   Int_t PreProcess(MParList *pList);
+  Int_t Process();
 
 protected:
@@ -85 +89 @@
   ~MExtractTimeAndChargeDigitalFilter() { }
 
-  Bool_t ReadWeightsFile(TString filename);
-  
   Bool_t WriteWeightsFile(TString filename,
                           TH1F *shapehi, TH2F *autocorrhi,
@@ -92 +94 @@
 
 
-  void SetNameWeightsFile(TString s="") { fNameWeightsFile = s; fNameWeightsFileSet=""; }
+  void SetNameWeightsFile(TString s="") { s.ReplaceAll("\015", ""); // This is a fix for TEnv files edited with windows editors
+      fNameWeightsFile = s; fNameWeightsFileSet=""; }
   void EnableAutomaticWeights(Bool_t b=kTRUE) { fAutomaticWeights = b; }