Changeset 5803 for trunk/MagicSoft/Mars/mjobs

Timestamp:

01/11/05 16:46:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (13 diffs)
• MJCalibrateSignal.h (modified) (1 diff)
• MJPedestal.cc (modified) (1 diff)
• MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -64 +64 @@
 #include "MReadMarsFile.h"
 #include "MRawFileRead.h"
+#include "MContinue.h"
+#include "MTriggerPatternDecode.h"
+#include "MFTriggerPattern.h"
 #include "MGeomApply.h"
 #include "MMcPedestalCopy.h"
@@ -69 +72 @@
 #include "MPedCalcFromLoGain.h"
 #include "MExtractor.h"
+#include "MFCosmics.h"
 #include "MTaskEnv.h"
 #include "MCalibrateData.h"
@@ -180 +184 @@
 }
 
-Bool_t MJCalibrateSignal::ProcessFile(MPedestalCam &pedcamab, MPedestalCam &pedcam2/*, MPedestalCam &pedcam*/)
+Bool_t MJCalibrateSignal::ProcessFile(MPedestalCam &pedcamab, MPedestalCam &pedcam2, MPedestalCam &pedcam)
 {
     if (!fSequence.IsValid())
@@ -324 +328 @@
     // Make sure that pedcamab has the correct name
     pedcamab.SetName("MPedestalFundamental");
-    //pedcam.SetName("MPedestalFromExtractorRndm");
+    pedcam.SetName("MPedestalFromExtractorRndm");
     pedcam2.SetName("MPedestalFromExtractor");
-    //plist.AddToList(&pedcam);
+    plist.AddToList(&pedcam);
     plist.AddToList(&pedcam2);
     plist.AddToList(&pedcamab);
 
+    // Check for interleaved events
+    MTriggerPatternDecode decode;
+
+    MFTriggerPattern ftp;
+    ftp.DenyCalibration();
+    ftp.DenyPedestal();
+    ftp.DenyPinDiode();
+
+    MContinue conttp(&ftp, "ContTrigPattern");
+    // --> tlist2
+
+    // Do signal and pedestal calculation
     MPedCalcFromLoGain     pedlo1("MPedCalcFundamental");
     pedlo1.SetPedestalUpdate(kTRUE);
     pedlo1.SetNamePedestalCamOut("MPedestalFundamental");
-    /*
-     MPedCalcFromLoGain     pedlo2("MPedCalcWithExtractorRndm");
-     pedlo2.SetPedestalUpdate(kTRUE);
-     pedlo2.SetRandomCalculation(kTRUE);
-     pedlo2.SetNamePedestalCamIn("MPedestalFundamental");
-     pedlo2.SetNamePedestalCamOut("MPedestalFromExtractorRndm");
-     */
+
+    MPedCalcFromLoGain     pedlo2("MPedCalcWithExtractorRndm");
+    pedlo2.SetPedestalUpdate(kTRUE);
+    pedlo2.SetRandomCalculation(kTRUE);
+    pedlo2.SetNamePedestalCamIn("MPedestalFundamental");
+    pedlo2.SetNamePedestalCamOut("MPedestalFromExtractorRndm");
 
     MPedCalcFromLoGain     pedlo3("MPedCalcWithExtractor");
@@ -352 +367 @@
         const Float_t win = extractor1->GetNumHiGainSamples();
         pedlo1.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
-        //pedlo2.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
+        pedlo2.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
         pedlo3.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
 
         if (extractor1->InheritsFrom("MExtractTimeAndCharge"))
         {
-            //pedlo2.SetExtractor((MExtractTimeAndCharge*)extractor1);
+            pedlo2.SetExtractor((MExtractTimeAndCharge*)extractor1);
             pedlo3.SetExtractor((MExtractTimeAndCharge*)extractor1);
             extractor1->SetPedestals(&pedcamab);
@@ -363 +378 @@
     }
 
-    MMcPedestalCopy        pcopy;
+    MFCosmics fcosmics;
+    fcosmics.SetNamePedestalCam("MPedestalFundamental");
+    MContinue contcos(&fcosmics, "ContTrigEvts");
+    contcos.SetInverted();
+
+    MMcPedestalCopy pcopy;
     MTaskEnv taskenv1("ExtractSignal");
     MTaskEnv taskenv2("ExtractTime");
@@ -376 +396 @@
         calib.AddPedestal("MPedestalCam", "MPedPhotFundamental");
         calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractor");
-        //calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm");
+        calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm");
     }
     else
@@ -382 +402 @@
         calib.AddPedestal("Fundamental");
         calib.AddPedestal("FromExtractor");
-        //calib.AddPedestal("FromExtractorRndm");
+        calib.AddPedestal("FromExtractorRndm");
         calib.SetPedestalFlag(MCalibrateData::kEvent);
     }
@@ -393 +413 @@
     treat.AddNamePedPhotCam("MPedPhotFundamental");
     treat.AddNamePedPhotCam("MPedPhotFromExtractor");
-    //treat.AddNamePedPhotCam("MPedPhotFromExtractorRndm");
+    treat.AddNamePedPhotCam("MPedPhotFromExtractorRndm");
 
 
@@ -438 +458 @@
     write.AddContainer("MPedPhotFundamental",       "Events");
     write.AddContainer("MPedPhotFromExtractor",     "Events");
-    //write.AddContainer("MPedPhotFromExtractorRndm", "Events");
+    write.AddContainer("MPedPhotFromExtractorRndm", "Events");
     write.AddContainer("MTime",                     "Events",     kFALSE);
     write.AddContainer("MRawEvtHeader",             "Events");
@@ -468 +488 @@
     // Now setup tasklist for events
     MTaskList tlist2;
+    tlist2.AddToList(&decode);
+    tlist2.AddToList(&conttp);
     tlist2.AddToList(&apply);
     tlist2.AddToList(&merge);
@@ -475 +497 @@
     {
         tlist2.AddToList(&pedlo1);
-        //tlist2.AddToList(&pedlo2);
+        tlist2.AddToList(&pedlo2);
         tlist2.AddToList(&pedlo3);
     }
@@ -484 +506 @@
     if (extractor2)
         tlist2.AddToList(&taskenv2);
+    tlist2.AddToList(&contcos);
     tlist2.AddToList(&fill2);
     tlist2.AddToList(&calib);

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -34 +34 @@
     MJCalibrateSignal(const char *name=NULL, const char *title=NULL);
 
-    Bool_t ProcessFile(MPedestalCam &camab, MPedestalCam &cam2/*, MPedestalCam &cam2*/);
+    Bool_t ProcessFile(MPedestalCam &camab, MPedestalCam &cam1, MPedestalCam &cam2);
 
     ClassDef(MJCalibrateSignal, 0) // Tool to create a pedestal file (MPedestalCam)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -537 +537 @@
       {
             
-        TCanvas &c3 = fDisplay->AddTab("PedExtrd");
-        c3.Divide(2,3);
-        
-        disp0.CamDraw(c3, 1, 2, 1);
-        disp1.CamDraw(c3, 2, 2, 6);
-        
-        TCanvas &c13 = fDisplay->AddTab("PedDiff");
-        c13.Divide(2,3);
-        
-        disp9.CamDraw(c13, 1, 2, 5);
-        disp10.CamDraw(c13, 2, 2, 5);
-        return;
+          TCanvas &c3 = fDisplay->AddTab(fExtractionType==kWithExtractor?"PedExtrd":"PedRndm");
+          c3.Divide(2,3);
+
+          disp0.CamDraw(c3, 1, 2, 1);
+          disp1.CamDraw(c3, 2, 2, 6);
+
+          TCanvas &c13 = fDisplay->AddTab(fExtractionType==kWithExtractor?"PedDiff":"DiffRndm");
+          c13.Divide(2,3);
+
+          disp9.CamDraw(c13, 1, 2, 5);
+          disp10.CamDraw(c13, 2, 2, 5);
+          return;
       }
 }

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -186 +186 @@
     //MBadPixelsMerge        merge(&badpix);
     MImgCleanStd           clean;
-    clean.SetNamePedPhotCam("MPedPhotFromExtractor");
+    clean.SetNamePedPhotCam("MPedPhotFromExtractorRndm");
 
     MHillasCalc            hcalc;