Changeset 6838 for trunk

Timestamp:

03/16/05 17:38:52 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• callisto.cc (modified) (2 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (3 diffs)
• mjobs/MJCalibrateSignal.h (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
    * callisto.cc:
      - set changed extractor in MJCalibrateSignal from MJPedestal
+      - don't process 'range finding' for MonteCarlo data
 
    * callisto.rc:
@@ -31 +32 @@
    * mjobs/MJCalibrateSignal.[h,cc]:
      - removed obsolete flag for ModifiedExtractWin
+     - allow also NULL for SetExtractor
+     - rearanged the too MWriteRootFile instantiations otherwise
+       callisto crashes in MWriteRootFile::ChangeFile
 
    * mdata/MDataChain.cc:

trunk/MagicSoft/Mars/callisto.cc

@@ -507 +507 @@
         job2.SetPathIn(kInpathY);
         job2.SetDataType(kDataType);
-        job2.SetPulsePosCheck();
+        job2.SetPulsePosCheck(kDataType!=MJCalib::kIsUseMC);
         job2.SetPathOut(kOutpathY); // for updating the extractor
 
@@ -576 +576 @@
         job4.SetPathData(kInpathD);
         job4.SetDataType(kDataType);
-        job4.SetExtractor(*job2.GetExtractor());
+        if (kDataType!=MJCalib::kIsUseMC)
+            job4.SetExtractor(job2.GetExtractor());
 
         // Where to search for calibration files

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -140 +140 @@
 }
 
-void MJCalibrateSignal::SetExtractor(const MExtractor &ext)
+void MJCalibrateSignal::SetExtractor(const MExtractor *ext)
 {
     if (fExtractor)
         delete fExtractor;
 
-    fExtractor = (MExtractor*)ext.Clone();
+    fExtractor = ext ? (MExtractor*)ext->Clone() : NULL;
 }
 
@@ -647 +647 @@
     MTaskEnv fillflorian("FinalFantasy");
     fillflorian.SetDefault();
+
+    // Write the special MC tree
+    MWriteRootFile writemc(2, fname, fOverwrite?"RECREATE":"NEW");
+    writemc.SetName("WriteMC");
+    writemc.AddContainer("MMcEvtBasic", "OriginalMC");
 
     // The second rule is for the case reading raw-files!
@@ -695 +700 @@
     write.AddContainer("MTimeCC",                   "CC",         kFALSE);
 
-    // Write the special MC tree
-    MWriteRootFile writemc(2, fname, fOverwrite?"RECREATE":"NEW");
-    writemc.SetName("WriteMC");
-    writemc.AddContainer("MMcEvtBasic", "OriginalMC");
-
     // Now setup tasklist for events
     MTaskList tlist2;

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -47 +47 @@
     void SetRelTimesUpdate ( const Bool_t b=kTRUE )  { fIsRelTimesUpdate  = b; }
 
-    void SetExtractor(const MExtractor &ext);
+    void SetExtractor(const MExtractor *ext=NULL);
 
     ClassDef(MJCalibrateSignal, 0) // Tool to create a pedestal file (MPedestalCam)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1273 +1273 @@
             if (newlast+wshigain > data->GetNumHiGainSamples()+data->GetNumLoGainSamples()-1)
               {
-                *fLog << err << "Pulse is too much to the right, cannot go beyond limits! " 
-                      << " Cannot extract at all! ... " << endl;
+                *fLog << err << "Pulse is too much to the right, cannot go beyond limits! " << endl;
+                *fLog << " Cannot extract at all! ... " << endl;
                 return kFALSE;
               }
             if (newlast+wslogain > data->GetNumLoGainSamples())
               {
-                *fLog << err << "Pulse is too much to the right, cannot go beyond logaie limits! " << endl;
+                *fLog << err << "Pulse is too much to the right, cannot go beyond logain limits! " << endl;
                 *fLog << endl;
                 *fLog << "Try to use a different extractor (e.g. with a window size of only 4 sl.) or:" << endl;