Changeset 5437 for trunk/MagicSoft/Mars

Timestamp:

11/20/04 13:41:51 (20 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MPad.cc (modified) (3 diffs)
• mfilter/MFSelBasic.cc (modified) (7 diffs)
• mfilter/MFSelBasic.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MPad.cc

@@ -503 +503 @@
   }  
 
-  *fLog << "hist2patternin = "  << hist2patternin << endl;
-  *fLog << "hist2patternout = " << hist2patternout << endl;
-  *fLog << "hist3pattern = " << hist3pattern << endl;
+  //*fLog << "hist2patternin = "  << hist2patternin << endl;
+  //*fLog << "hist2patternout = " << hist2patternout << endl;
+  //*fLog << "hist3pattern = " << hist3pattern << endl;
 
 
   TAxis *axs = hist2patternin->GetXaxis();
   Int_t nbinsthetas = axs->GetNbins();
-  *fLog << "vor fHSigmaTheta : nbinsthetas = " << nbinsthetas << endl;
+  //*fLog << "vor fHSigmaTheta : nbinsthetas = " << nbinsthetas << endl;
 
   TArrayD edgess;
@@ -517 +517 @@
   {
     edgess[i] = axs->GetBinLowEdge(i+1);
-    *fLog << all << "i, theta low edge = " << i << ",  " << edgess[i] 
-          << endl; 
+    //*fLog << all << "i, theta low edge = " << i << ",  " << edgess[i] 
+    //      << endl; 
   }
 
@@ -912 +912 @@
   // write the target padding histograms onto a file  ---------
   WritePaddingDist(fileout);     
+
+  //-------------------------------------------------------
+  TCanvas *pad = MH::MakeDefCanvas("target", "target", 600, 300); 
+  gROOT->SetSelectedPad(NULL);
+
+  pad->Divide(2, 1);
+
+  pad->cd(1);
+  gPad->SetBorderMode(0);
+  fHSigmaTheta->SetDirectory(NULL);
+  fHSigmaTheta->UseCurrentStyle();
+  fHSigmaTheta->DrawClone();
+  fHSigmaTheta->SetBit(kCanDelete);    
+
+  pad->cd(2);
+  gPad->SetBorderMode(0);
+  fHSigmaThetaOuter->SetDirectory(NULL);
+  fHSigmaThetaOuter->UseCurrentStyle();
+  fHSigmaThetaOuter->DrawClone();
+  fHSigmaThetaOuter->SetBit(kCanDelete);    
+
+  pad->Draw();
 
   return kTRUE;

trunk/MagicSoft/Mars/mfilter/MFSelBasic.cc

@@ -37 +37 @@
 //      remove bad runs
 //      thetamin < theta < thetamax
+//      phimin   < phi   < phimax
 //      software trigger fullfilled (with minimum no.of photons = minphotons)
 //
@@ -71 +72 @@
 
     // default values of cuts
-    SetCuts(20.0, 0.0, 60.0);
+    SetCuts(20.0, 0.0, 60.0, 0.0, 360.0);
 }
 
@@ -80 +81 @@
 //
 void MFSelBasic::SetCuts(Float_t minphotons, 
-                            Float_t thetamin, Float_t thetamax)
+                         Float_t thetamin, Float_t thetamax,
+                         Float_t phimin,   Float_t phimax)
 {
     fMinPhotons = minphotons;
+
     fThetaMin   = thetamin;
     fThetaMax   = thetamax;
 
+    fPhiMin   = phimin;
+    fPhiMax   = phimax;
 }
 
@@ -126 +131 @@
 
     //-------------------------
-    *fLog << inf << "MFSelBasic cut values : fMinPhotons, fThetaMin, fThetaMax = ";
-    *fLog << fMinPhotons <<",  " << fThetaMin << ",  " << fThetaMax << endl;
+    *fLog << inf << "MFSelBasic cut values : fMinPhotons, fThetaMin, fThetaMax, fPhiMin, fPhiMax = ";
+    *fLog << fMinPhotons << ",  " << fThetaMin << ",  " << fThetaMax << ",  " 
+          << fPhiMin     << ",  " << fPhiMax   << endl;
     //-------------------------
 
@@ -150 +156 @@
 {
     const Double_t theta = fPointPos->GetZd();
+    const Double_t phi   = fPointPos->GetAz();
 
     fResult  = kFALSE;
@@ -168 +175 @@
         return Set(3);
 
+    if (phi<fPhiMin)
+        return Set(5);
+
+    if (phi>fPhiMax)
+        return Set(6);
+
     if (!SwTrigger())
         return Set(4);
@@ -252 +265 @@
     *fLog << "%) Evts skipped due to: Zenith angle > " << fThetaMax << endl;
 
+    *fLog << " " << setw(7) << fCut[5] << " (" << setw(3) ;
+    *fLog << (int)(fCut[5]*100/GetNumExecutions()) ;
+    *fLog << "%) Evts skipped due to: Azimuth angle < " << fPhiMin << endl;
+
+    *fLog << " " << setw(7) << fCut[6] << " (" << setw(3) ;
+    *fLog << (int)(fCut[6]*100/GetNumExecutions()) ;
+    *fLog << "%) Evts skipped due to: Azimuth angle > " << fPhiMax << endl;
+
     *fLog << " " << setw(7) << fCut[4] << " (" << setw(3) ;
     *fLog << (int)(fCut[4]*100/GetNumExecutions()) ;

trunk/MagicSoft/Mars/mfilter/MFSelBasic.h

@@ -33 +33 @@
     Float_t     fThetaMax;
 
-    Int_t       fCut[5];
+    Float_t     fPhiMin;
+    Float_t     fPhiMax;
+
+    Int_t       fCut[7];
 
     Bool_t      fResult;
@@ -50 +53 @@
     MFSelBasic(const char *name=NULL, const char *title=NULL);
 
-    void SetCuts(Float_t minphotons, Float_t thetamin, Float_t thetamax);
+    void SetCuts(Float_t minphotons=0.0, 
+                 Float_t thetamin=0.0, Float_t thetamax=90.0,
+                 Float_t phimin=0.0,   Float_t phimax=360.0);
 
     ClassDef(MFSelBasic, 0)   // Class to evaluate basic cuts