Changeset 1982 for trunk

Timestamp:

04/22/03 17:33:59 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfilter/MFCT1SelFinal.cc (modified) (5 diffs)
• mfilter/MFCT1SelFinal.h (modified) (3 diffs)
• mmontecarlo/MMcEnergyEst.cc (modified) (1 diff)
• mmontecarlo/Makefile (modified) (2 diffs)
• mmontecarlo/MonteCarloLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/04/22: Abelardo Moralejo
+
+    * mmontecarlo/Makefile, MontecarloLinkDef.h
+      - added MMcEnergyEst
+      - added necessary include directories.
+
+    * mmontecarlo/MMcEnergyEst.cc
+      - added filterhadrons.SetHadronnessName(fHadronnessName) to
+        inform the filter about the name of the hadronness container
+        to be used in the cuts.
+
+    * mfilter/MFCT1SelFinal.[h,cc]
+      - added the possibility to cut also in Dist.
 
  2003/04/22: Thomas Bretz

trunk/MagicSoft/Mars/mfilter/MFCT1SelFinal.cc

@@ -46 +46 @@
 #include "MMcEvt.hxx"
 #include "MGeomCam.h"
+#include "MGeomCamCT1.h"
 #include "MGeomPix.h"
 #include "MHadronness.h"
@@ -68 +69 @@
     fHadronnessName = "MHadronness";
 
+    MGeomCamCT1 camct1;
+    fMm2Deg = camct1.GetConvMm2Deg();
+
     // default values of cuts
-    SetCuts(1.0, 100.0);
+    SetCuts(1.0, 100.0, 10.);
 }
 
@@ -77 +81 @@
 // 
 //
-void MFCT1SelFinal::SetCuts(Float_t hadmax, Float_t alphamax) 
+void MFCT1SelFinal::SetCuts(Float_t hadmax, Float_t alphamax, Float_t distmax) 
 { 
   fHadronnessMax = hadmax; 
-  fAlphaMax      = alphamax;  
+  fAlphaMax      = alphamax;
+  fDistMax       = distmax; 
 
   *fLog << inf << "MFCT1SelFinal cut values : fHadronnessMax, fAlphaMax = "
-        << fHadronnessMax << ",  " << fAlphaMax << endl;
+        << fHadronnessMax << ",  " << fAlphaMax << ",  fDistMax = " << fDistMax 
+<<  endl;
 }
 
@@ -150 +156 @@
     {
       rc = 2;
+      fResult = kTRUE;
+    }
+
+    else if ( fMm2Deg*fHilSrc->GetDist() > fDistMax )
+    {
+      rc = 3;
       fResult = kTRUE;
     }    
@@ -180 +192 @@
           << " [degrees]" << endl;
 
+    *fLog << " " << setw(7) << fCut[3] << " (" << setw(3) 
+          << (int)(fCut[3]*100/GetNumExecutions()) 
+          << "%) Evts skipped due to: DIST > " << fDistMax
+          << " [degrees]" << endl;
+
     *fLog << " " << fCut[0] << " (" 
           << (int)(fCut[0]*100/GetNumExecutions()) 

trunk/MagicSoft/Mars/mfilter/MFCT1SelFinal.h

@@ -32 +32 @@
 
     Double_t     fMm2Deg;   // conversion mm to degrees in camera
-    Int_t        fCut[3];
+    Int_t        fCut[4];
     TString      fHilName;
     TString      fHilSrcName;
@@ -39 +39 @@
     Float_t      fHadronnessMax;
     Float_t      fAlphaMax;
+    Float_t      fDistMax;
 
     Bool_t       fResult;
@@ -54 +55 @@
     Bool_t PostProcess();
 
-    void SetCuts(Float_t hadmax, Float_t alphamax); 
+    void SetCuts(Float_t hadmax, Float_t alphamax, Float_t distmax); 
 
     ClassDef(MFCT1SelFinal, 0)   // Class to evaluate final cuts

trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.cc

@@ -92 +92 @@
 
   MFCT1SelFinal filterhadrons;
+  filterhadrons.SetHadronnessName(fHadronnessName);
   filterhadrons.SetCuts(fMaxHadronness, fMaxAlpha, fMaxDist);
   filterhadrons.SetInverted();

trunk/MagicSoft/Mars/mmontecarlo/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mmc -I../mhist -I../mhistmc
+INCLUDES = -I. -I../mbase -I../mmc -I../mhist -I../mhistmc -I../mgeom -I../manalysis -I../mtools -I../mfileio -I../mfilter -I../mdata
 
 #------------------------------------------------------------------------------
@@ -32 +32 @@
            MMcTimeGenerate.cc \
            MMcTriggerRateCalc.cc \
-           MMcCT1CollectionAreaCalc.cc
+           MMcCT1CollectionAreaCalc.cc \
+           MMcEnergyEst.cc
 
 SRCS    = $(SRCFILES)

trunk/MagicSoft/Mars/mmontecarlo/MonteCarloLinkDef.h

@@ -10 +10 @@
 #pragma link C++ class MMcTriggerRateCalc+;
 #pragma link C++ class MMcCT1CollectionAreaCalc+;
-
+#pragma link C++ class MMcEnergyEst+;
 #endif