Changeset 1770 for trunk/MagicSoft/Mars/manalysis

Timestamp:

02/20/03 15:32:13 (22 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MPadSchweizer.cc (modified) (10 diffs)
• MPadSchweizer.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc

@@ -272 +272 @@
   //fSigmabar->Print("");
 
-  if (SigbarOld > 0.0)
-  {
-    *fLog << "MPadSchweizer::Process(); Sigmabar of event to be padded is > 0 : "
-          << SigbarOld << ". Stop event loop " << endl;
+  //if (SigbarOld > 0.0)
+  //{
+    //*fLog << "MPadSchweizer::Process(); Sigmabar of event to be padded is > 0 : "
+    //      << SigbarOld << ". Stop event loop " << endl;
     // input data should have Sigmabar = 0; stop event loop
-    return kFALSE; 
-  }
+    // return kFALSE; 
+  //}
 
   Double_t Theta  = kRad2Deg*fMcEvt->GetTelescopeTheta();
@@ -307 +307 @@
             << binNumber << " has no entries; Skip event " << endl;
       // event cannot be padded; skip event
+      delete fHSigma;
       return kCONTINUE;
     }
@@ -328 +329 @@
   if (Sigmabar <= SigbarOld)
   {
+    *fLog << "MPadSchweizer::Process(); target Sigmabar is less than SigbarOld : "
+          << Sigmabar << ",  " << SigbarOld << ",   Skip event" << endl;
     return kCONTINUE;     
   }
@@ -360 +363 @@
   Double_t RMS = fHNoise->GetRMS(1);  
   delete fHNoise;
-  elNoise2 = TMath::Min(2.0*RMS,  Sigmabar*Sigmabar - SigbarOld*SigbarOld);
+  elNoise2 = TMath::Min(RMS,  Sigmabar*Sigmabar - SigbarOld*SigbarOld);
   //*fLog << "elNoise2 = " << elNoise2 << endl; 
 
@@ -375 +378 @@
   //                   - and for which the no.of photons is != 0.0
   //
-  Double_t Sig         = 0.0;
-  Double_t Sigma2      = 0.0;
-  Double_t Diff        = 0.0;
-  Double_t addSig2     = 0.0;
-  Double_t elNoise2Pix = 0.0;
+  Double_t Sig;
+  Double_t Sigma2;
+  Double_t Diff;
+  Double_t addSig2;
+  Double_t elNoise2Pix;
 
 
@@ -504 +507 @@
     //       and its RMS (sigmaNSB) 
     Double_t NSB0 = fRnd->Poisson(lambdabar*Area);
-    Double_t sigmaNSB0 = sqrt( NSB0*(F2excess-1.0) + elNoise2Pix );
+    Double_t arg  = NSB0*(F2excess-1.0) + elNoise2Pix;
+    Double_t sigmaNSB0;
+
+    if (arg >= 0.0)
+    {
+      sigmaNSB0 = sqrt( arg );
+    }
+    else
+    {
+      *fLog << "MPadSchweizer::Process(); argument of sqrt < 0.0 : " 
+            << arg << endl;
+      sigmaNSB0 = 0.0000001;      
+    }
+
 
     //---------------------------------
@@ -578 +594 @@
 Bool_t MPadSchweizer::PostProcess()
 {
-    TCanvas &c = *(MH::MakeDefCanvas("PadSchweizer", "", 900, 900)); 
-    c.Divide(3, 3);
+    TCanvas &c = *(MH::MakeDefCanvas("PadSchweizer", "", 900, 1200)); 
+    c.Divide(3, 4);
     gROOT->SetSelectedPad(NULL);
 
 
     c.cd(1);
-    fHSigmaTheta->SetTitle("2D : Sigmabar, \\Theta (before padding)");
+    fHSigmaTheta->SetTitle("2D : Sigmabar, \\Theta (reference sample)");
     fHSigmaTheta->DrawClone();     
     fHSigmaTheta->SetBit(kCanDelete);     
@@ -596 +612 @@
     fHSigbarTheta->SetBit(kCanDelete);     
 
-      //c.cd(3);
-      //fHSigmaPedestal->DrawClone();
-      //fHSigmaPedestal->SetBit(kCanDelete);    
-
-      //c.cd(5);
-      //fHPhotons->DrawClone();
-      //fHPhotons->SetBit(kCanDelete);    
 
     c.cd(7);
@@ -614 +623 @@
     TH2D *l;
 
-    *fLog << "before" << endl;
-
     c.cd(2);
     l = (TH2D*) ((TH3*)fHDiffPixTh)->Project3D("zx");
-
-    *fLog << "after" << endl;
 
     l->SetTitle("Sigma^2-Sigmabar^2 vs. \\Theta (all pixels)");
@@ -671 +676 @@
     //--------------------------------------------------------------------
 
+    c.cd(10);
+    fHSigmaPedestal->DrawClone();
+    fHSigmaPedestal->SetBit(kCanDelete);    
+
+    c.cd(11);
+    fHPhotons->DrawClone();
+    fHPhotons->SetBit(kCanDelete);    
+
+    //--------------------------------------------------------------------
+
   return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/MPadSchweizer.h

@@ -28 +28 @@
 {
 private:
-    MGeomCam       *fCam; 
+    const MGeomCam *fCam; 
     MCerPhotEvt    *fEvt; 
     MSigmabar      *fSigmabar;