Changeset 7043 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/17/05 12:08:31 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (3 diffs)
• MJPedestal.cc (modified) (2 diffs)
• MJPedestal.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -943 +943 @@
       TText *t3 = pave2->AddText(Form("Signal Sigma smaller Pedestal RMS:      %3i pixels",
                                        CountBadPixels(&disp25,1)));
-      t3->SetTextColor(gStyle->GetColorPalette(Int_t(1./max2*numcol + 1.)));
+      t3->SetTextColor(gStyle->GetColorPalette(Int_t(1./max2*numcol)));
       t3->SetTextAlign(12);
-
-      TText *t7 = pave2->AddText(Form("Deviating Number of Photo-electrons:     %3i pixels",
-                                       CountBadPixels(&disp25,2)));
-      t7->SetTextColor(gStyle->GetColorPalette(Int_t(2./max*numcol + 1.)));
-      t7->SetTextAlign(12);
-
-      TText *tt1 = pave2->AddText(Form("High Gain Signals could not be fitted:   %3i pixels",
+      TText *tt1 = pave2->AddText(Form("High Gain Signals could not be fitted:    %3i pixels",
                                        CountBadPixels(&disp25,3)));
-      tt1->SetTextColor(gStyle->GetColorPalette(Int_t(3./max2*numcol + 1.)));
+      tt1->SetTextColor(gStyle->GetColorPalette(Int_t(3./max2*numcol)));
       tt1->SetTextAlign(12);
-      TText *tt2 = pave2->AddText(Form("Low  Gain Signals could not be fitted:   %3i pixels",
+      TText *tt2 = pave2->AddText(Form("Low  Gain Signals could not be fitted:    %3i pixels",
                                        CountBadPixels(&disp25,4)));
-      tt2->SetTextColor(gStyle->GetColorPalette(Int_t(4./max2*numcol + 1.)));
+      tt2->SetTextColor(gStyle->GetColorPalette(Int_t(4./max2*numcol)));
       tt2->SetTextAlign(12);
-      TText *tt3 = pave2->AddText(Form("Relative Arr. Times could not be fitted:  %3i pixels",
+      TText *tt3 = pave2->AddText(Form("Relative Arr. Times could not be fitted:   %3i pixels",
                                        CountBadPixels(&disp25,5)));
-      tt3->SetTextColor(gStyle->GetColorPalette(Int_t(5./max2*numcol + 1.)));
+      tt3->SetTextColor(gStyle->GetColorPalette(Int_t(5./max2*numcol)));
       tt3->SetTextAlign(12);
-      TText *tt4 = pave2->AddText(Form("High Gain Signals Oscillation:                %3i pixels",
+      TText *tt4 = pave2->AddText(Form("High Gain Signals Oscillation:                 %3i pixels",
                                        CountBadPixels(&disp25,6)));
-      tt4->SetTextColor(gStyle->GetColorPalette(Int_t(6./max2*numcol + 1.)));
+      tt4->SetTextColor(gStyle->GetColorPalette(Int_t(6./max2*numcol)));
       tt4->SetTextAlign(12);
       TText *tt5 = pave2->AddText(Form("Low  Gain Signals Oscillation:                %3i pixels",
                                        CountBadPixels(&disp25,7)));
-      tt5->SetTextColor(gStyle->GetColorPalette(Int_t(7./max2*numcol + 1.)));
+      tt5->SetTextColor(gStyle->GetColorPalette(Int_t(7./max2*numcol)));
       tt5->SetTextAlign(12); 
       TText *tt6 = pave2->AddText(Form("Relative Arr. Times Oscillation:               %3i pixels",
                                        CountBadPixels(&disp25,8)));
-      tt6->SetTextColor(gStyle->GetColorPalette(Int_t(8./max2*numcol + 1.)));
+      tt6->SetTextColor(gStyle->GetColorPalette(Int_t(8./max2*numcol)));
       tt6->SetTextAlign(12);
-      TText *tt8 = pave2->AddText(Form("Deviating global F-Factor:                        %3i pixels",
+      TText *tt8 = pave2->AddText(Form("Deviating global F-Factor:                       %3i pixels",
                                        CountBadPixels(&disp25,9)));
-      tt8->SetTextColor(gStyle->GetColorPalette(Int_t(9./max2*numcol + 1.)));
+      tt8->SetTextColor(gStyle->GetColorPalette(Int_t(9./max2*numcol)));
       tt8->SetTextAlign(12);
       pave2->Draw();
@@ -1561 +1555 @@
 Bool_t MJCalibration::CheckEnvLocal()
 {
-
     TString dis = GetEnv("Display", "");
     if (dis.BeginsWith("Full", TString::kIgnoreCase))
@@ -1935 +1928 @@
     //
     MFCosmics cosmics;
-    MContinue cont(&cosmics);
-
-    if (fColor == MCalibrationCam::kCT1)
-      tlist.AddToList(&cont);
+    cosmics.SetMaxEmptyPixels(0.05);
+    cosmics.SetMinAcceptedFraction(0.5);
+
+    MContinue cont(&cosmics, "ContCosmics");
+    tlist.AddToList(&cont);
 
     MCalibColorSteer steer;

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -154 +154 @@
 }
 
-MExtractor *MJPedestal::ReadCalibration() const
+MExtractor *MJPedestal::ReadCalibration()
 {
     const TString fname = Form("%s/calib%08d.root", fPathIn.Data(), fSequence.GetSequence());
@@ -172 +172 @@
         *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl;
         return NULL;
+    }
+
+    if (file.FindKey("MBadPixelsCam"))
+    {
+        MBadPixelsCam bad;
+        if (bad.Read()<=0)
+            *fLog << warn << "Unable to read MBadPixelsCam from " << fname << endl;
+        else
+            fBadPixels.Merge(bad);
     }
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -74 +74 @@
     Bool_t fIsUseHists;                      // Switch on histogramming or not
 
-    MExtractor *ReadCalibration() const;
+    MExtractor *ReadCalibration();
     Bool_t ReadPedestalCam();
     Bool_t WriteResult();