Changeset 6839

Timestamp:

03/16/05 19:15:26 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -35 +35 @@
      - rearanged the too MWriteRootFile instantiations otherwise
        callisto crashes in MWriteRootFile::ChangeFile
+     - removed some obsolete comments about an old MC workaround
 
    * mdata/MDataChain.cc:

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -543 +543 @@
 
     // 
-    // This is new calibration to eff. photo-electrons, hard-coded as decided 
-    // at the Wuerzburg software meeting 26.01.05
+    // This is new calibration to photo-electrons, hard-coded
+    // as decided at the Wuerzburg software meeting 26.01.05
     //
     MCalibrateData calib;
     calib.SetSignalType(MCalibrateData::kPhe);
-    //----- WORKAROUND: Currently MC has no lo-gain switch ------
-    //if (IsUseMC()) // MC file
-    //{
-    //    calib.SetCalibrationMode(MCalibrateData::kFfactor);
-    //    calib.SetPedestalFlag(MCalibrateData::kRun);
-    //    // FIXME: What to do for MC files???
-    //    calib.AddPedestal("MPedestalCam", "MPedPhotFundamental");
-    //    calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractor");
-    //    calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm");
-    //}
-    //else
-    //{
-        calib.AddPedestal("Fundamental");
-        calib.AddPedestal("FromExtractor");
-        calib.AddPedestal("FromExtractorRndm");
-        calib.SetPedestalFlag(MCalibrateData::kEvent);
-    //}
+    calib.AddPedestal("Fundamental");
+    calib.AddPedestal("FromExtractor");
+    calib.AddPedestal("FromExtractorRndm");
+    calib.SetPedestalFlag(MCalibrateData::kEvent);
     //----------------------------------------------------------
 
@@ -625 +612 @@
     MHCamEvent evt7(0, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
     MHCamEvent evt8(0, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
+    //MHCamEvent evt9(0, "PulsePos",   "Pulse Position of cosmics"); //Calibration Conv. Factors;;[phe/fadc cnts]
 
     evt0.EnableSqrtVariance();
@@ -644 +632 @@
     MFillH fill7(&evt7, "MArrivalTime",            "FillTimes");
     MFillH fill8(&evt8, "MCalibConstCam",          "FillConv");
+    //MFillH fill9(&evt9, "MCalibConstCam",          "FillPulse");
 
     MTaskEnv fillflorian("FinalFantasy");
@@ -707 +696 @@
     tlist2.AddToList(&apply);
     tlist2.AddToList(&merge);
-    //----- WORKAROUND: Currently MC has no lo-gain switch ------
-    //if (IsUseMC())
-    //    tlist2.AddToList(&pcopy);
-    //else
-    //{
-        tlist2.AddToList(&pedlo1);
-        tlist2.AddToList(&pedlo2);
-        tlist2.AddToList(&pedlo3);
-    //}
+    tlist2.AddToList(&pedlo1);
+    tlist2.AddToList(&pedlo2);
+    tlist2.AddToList(&pedlo3);
     //-----------------------------------------------------------
     if (fIsInterlaced)
@@ -870 +853 @@
         return;
 
+    MGeomCam &geomcam = *(MGeomCam*)plist.FindObject("MGeomCam");
+
     //
     // Get container from list
     //
-    MGeomCam        &geomcam       = *(MGeomCam*)plist.FindObject("MGeomCam");
     MCalibrationPulseTimeCam *pcam = (MCalibrationPulseTimeCam*)plist.FindObject("MCalibrationPulseTimeCam");