Changeset 8986 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/21/08 14:56:03 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

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

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -159 +159 @@
 
     if (fDisplay)
+    {
+        TString title = "--  Calibrate Signal: ";
+        title += fSequence.GetSequence();
+        title += "  --";
+        fDisplay->SetTitle(title, kFALSE);
+
         cont.Add(fDisplay);
+    }
 
     const TString name(Form("signal%08d.root", fSequence.GetSequence()));

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -317 +317 @@
     // Update display
     //
-    TString title = fDisplay->GetTitle();
-    title += "--  Calibration ";
-    title += Form("calib%08d", fSequence.GetSequence());
+    TString title = "--  Calibration: ";
+    title += fSequence.GetSequence();
     title += "  --";
-    fDisplay->SetTitle(title);
+    fDisplay->SetTitle(title, kFALSE);
 
     //

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -202 +202 @@
     // Update display
     //
-    TString title = fDisplay->GetTitle();
-    title += "--  Pedestal ";
-    title += fSequence.GetFileName();
+    TString title = "--  Pedestal: ";
+    title += fSequence.GetSequence();
     title += "  --";
-    fDisplay->SetTitle(title);
+    fDisplay->SetTitle(title, kFALSE);
 
     //
     // Get container from list
     //
-    MGeomCam           &geomcam   = *(MGeomCam*)plist.FindObject("MGeomCam");
+    const MGeomCam &geomcam = *(MGeomCam*)plist.FindObject("MGeomCam");
     //    MCalibrationPedCam &calpedcam = *(MCalibrationPedCam*)plist.FindObject("MCalibrationPedCam");
 
@@ -276 +275 @@
       }
     */
-    
+
     if (fExtractionType!=kFundamental/*fExtractorResolution*/)
       {
@@ -326 +325 @@
         return;
       }
-    
+
 /*
     if (fIsUseHists)
@@ -362 +361 @@
         TCanvas &c3 = fDisplay->AddTab(fExtractionType!=kFundamental/*fExtractorResolution*/ ? "PedExtrd" : "Ped");
         c3.Divide(2,3);
-        
+
         c3.cd(1);
         gPad->SetBorderMode(0);
@@ -390 +389 @@
         obj1->SetPrettyPalette();
         obj1->Draw();
-        
+
         c3.cd(5);
         gPad->SetBorderMode(0);
@@ -404 +403 @@
         FixDataCheckHist(obj2);
         obj2->SetStats(1);
-        
+
         c3.cd(2);
         gPad->SetBorderMode(0);
@@ -422 +421 @@
         //
         DisplayReferenceLines(obj3,1);
-        
+
         c3.cd(4);
         gPad->SetBorderMode(0);
@@ -430 +429 @@
         c3.cd(6);
         gPad->SetBorderMode(0);
-        
+
         if (geomcam.InheritsFrom("MGeomCamMagic"))
           {
@@ -512 +511 @@
           }
       }
-    
+
     if (fExtractionType!=kFundamental/*fExtractorResolution*/)
       {
-            
+
           TCanvas &c3 = fDisplay->AddTab(fExtractionType==kWithExtractor?"PedExtrd":"PedRndm");
           c3.Divide(2,3);
@@ -530 +529 @@
       }
 }
-
 
 void  MJPedestal::DisplayReferenceLines(MHCamera *cam, const Int_t what) const
@@ -1099 +1097 @@
     // The selection is done with the trigger bits before prescaling
     MTriggerPatternDecode decode;
-    MFTriggerPattern fcalib("CalibFilter");
+    MFTriggerPattern fcalib("SelectCosmics");
     fcalib.SetDefault(kTRUE);
     fcalib.DenyAll();
@@ -1116 +1114 @@
     tlist.AddToList(&pedsub);
 
+    // FIXME: MUX Monte Carlos?!??
     if (fIsPulsePosCheck)
     {
@@ -1135 +1134 @@
     //------------------------------
     // Require that before the Prescaling we had only a pedestal trigger
-    MFTriggerPattern ftp2("PedestalFilter");
+    MFTriggerPattern ftp2("SelectPedestals");
     ftp2.SetDefault(kTRUE);
     ftp2.DenyAll();
     ftp2.RequirePedestal();
 
+    // FIXME: WHAT D WE DO IN CASE OF MUX MCs????
     if (!fSequence.IsMonteCarlo() && (!fExtractor || !fExtractor->HasLoGain()))
     {