Changeset 4367 for trunk/MagicSoft/Mars

Timestamp:

06/30/04 15:42:27 (20 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• library/MControlPlots.cc (modified) (5 diffs)
• library/MDisp.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+  2004/06/30: Javier Rico
+
+    * mifae/library/MDisp.cc
+      - Remove include of deprecated library
+      - Define namespace
+
+    * mifae/library/MControlPlots.cc
+      - Define style
+      - Add projection
+      - Plot 3rd plot correctly
+      - Search for "MIsland" instead of "MIsland1" container
 
   2004/06/26: Eva Domingo - Pepe Flix

trunk/MagicSoft/Mars/mtemp/mifae/library/MControlPlots.cc

@@ -31 +31 @@
 #include <fstream>
 
+#include "TStyle.h"
+
 #include "MParList.h"
 #include "MControlPlots.h"
@@ -86 +88 @@
 
   // look for MIslands object
-  fIslands = (MIslands*)pList->FindObject("MIslands1");
+  fIslands = (MIslands*)pList->FindObject("MIslands");
   if (!fIslands)
     *fLog << warn << AddSerialNumber("MIslands") << " [MIslands] not found... Some control plots will not be produced" << endl;
@@ -129 +131 @@
     }
 
+  // Canvas style
+  gStyle->SetCanvasColor(0);
+  gStyle->SetCanvasBorderMode(0);
+  gStyle->SetPadBorderMode(0);
+  gStyle->SetFrameBorderMode(0);
+  gStyle->SetStatColor(0);
+  gStyle->SetTitleFillColor(0);
+
   TCanvas* c = new TCanvas("survivals","Pixels surviving Image Cleaning",800,800);
+  MHCamera* diff=NULL;
 
   // in case both on and off histos are present, print both and the difference between them
   if(fCameraHisto[kOn] && fCameraHisto[kOff])
     {      
-      MHCamera diff(*fGeomCam,"Diff","Pixels surviving Image Cleaning");
+      diff = new MHCamera(*fGeomCam,"Diff","Pixels surviving Image Cleaning");
   
-      for(Int_t i=1;i<=diff.GetSize()-2;i++)
+      for(Int_t i=1;i<diff->GetSize()-2;i++)
         {
-          diff.SetBinContent(i,(Double_t)fCameraHisto[kOn]->GetBinContent(i)-fCameraHisto[kOff]->GetBinContent(i));
-          diff.SetUsed(i);
+          diff->SetBinContent(i,(Double_t)fCameraHisto[kOn]->GetBinContent(i)-fCameraHisto[kOff]->GetBinContent(i));
+          diff->SetUsed(i);
         }      
       fCameraHisto[kOn]->SetPrettyPalette();
       fCameraHisto[kOff]->SetPrettyPalette();
-      diff.SetPrettyPalette();
+      diff->SetPrettyPalette();
 
       c->Divide(2,2);
-          
+
+      Float_t max = TMath::Max(fCameraHisto[kOn]->GetMaximum(),fCameraHisto[kOff]->GetMaximum());
+      Float_t min = TMath::Min(fCameraHisto[kOn]->GetMinimum(),fCameraHisto[kOff]->GetMinimum());
+      fCameraHisto[kOn]->SetMaximum(max);
+      fCameraHisto[kOn]->SetMinimum(min); 
+      fCameraHisto[kOff]->SetMaximum(max);
+      fCameraHisto[kOff]->SetMinimum(min); 
+      
       c->cd(1);
       fCameraHisto[kOn]->Draw();
@@ -158 +176 @@
 
       c->cd(3);
-      diff.Draw();
+      diff->Draw();
       gPad->Modified();
       gPad->Update();      
+
+      c->cd(4);
+      diff->DrawProjection();
+      gPad->Modified();
+      gPad->Update();
     }
   // plot the existing histo
@@ -173 +196 @@
   c->SaveAs(fFileName);
   delete c;  
+  if(diff)
+    delete diff;
   return kTRUE;
 }

trunk/MagicSoft/Mars/mtemp/mifae/library/MDisp.cc

@@ -44 +44 @@
 #include "MDisp.h"
 
-#include <iostream.h>
+#include <iostream>
 //#include <TArrayF.h>
 
@@ -50 +50 @@
 #include "MLogManip.h"
 
+using namespace std;
 ClassImp(MDisp);