Changeset 1872 for trunk/MagicSoft

Timestamp:

03/28/03 08:50:05 (22 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MNewImagePar.cc (added)
• manalysis/MNewImagePar.h (added)
• manalysis/MNewImageParCalc.cc (added)
• manalysis/MNewImageParCalc.h (added)
• manalysis/MSelBasic.cc (modified) (5 diffs)
• manalysis/MSelBasic.h (modified) (1 diff)
• manalysis/MSelStandard.cc (modified) (3 diffs)
• mhist/MHNewImagePar.cc (added)
• mhist/MHNewImagePar.h (added)

trunk/MagicSoft/Mars/manalysis/MSelBasic.cc

@@ -60 +60 @@
     fName  = name  ? name  : "MSelBasic";
     fTitle = title ? title : "Task to evaluate basic cuts";
+
+    ThetaMin =  0.0;
+    ThetaMax = 60.0;
 }
 
@@ -205 +208 @@
 
     Double_t Theta = kRad2Deg*fMcEvt->GetTelescopeTheta();
-    if ( Theta < 0.0 )
+    if ( Theta < ThetaMin )
     {
       *fLog << "MSelBasic::Process; Run, Event, Theta = " 
@@ -213 +216 @@
     }    
 
-    else if ( Theta > 45.0 )
+    else if ( Theta > ThetaMax )
     {
       rc = 2;
@@ -313 +316 @@
     *fLog << GetDescriptor() << " execution statistics:" << endl;
     *fLog << dec << setfill(' ');
-    *fLog << " " << setw(7) << fErrors[1] << " (" << setw(3) << (int)(fErrors[1]*100/GetNumExecutions()) << "%) Evts skipped due to: Zenith angle < 0" << endl;
-
-    *fLog << " " << setw(7) << fErrors[2] << " (" << setw(3) << (int)(fErrors[2]*100/GetNumExecutions()) << "%) Evts skipped due to: Zenith angle too high" << endl;
-
-    *fLog << " " << setw(7) << fErrors[3] << " (" << setw(3) << (int)(fErrors[3]*100/GetNumExecutions()) << "%) Evts skipped due to: Software trigger not fullfilled" << endl;
-
-    *fLog << " " << fErrors[0] << " (" << (int)(fErrors[0]*100/GetNumExecutions()) << "%) Evts survived Basic selections!" << endl;
+    *fLog << " " << setw(7) << fErrors[1] << " (" << setw(3) 
+          << (int)(fErrors[1]*100/GetNumExecutions()) 
+          << "%) Evts skipped due to: Zenith angle < " << ThetaMin << endl;
+
+    *fLog << " " << setw(7) << fErrors[2] << " (" << setw(3) 
+          << (int)(fErrors[2]*100/GetNumExecutions()) 
+          << "%) Evts skipped due to: Zenith angle > " << ThetaMax << endl;
+
+    *fLog << " " << setw(7) << fErrors[3] << " (" << setw(3) 
+          << (int)(fErrors[3]*100/GetNumExecutions()) 
+          << "%) Evts skipped due to: Software trigger not fullfilled" << endl;
+
+    *fLog << " " << fErrors[0] << " (" << (int)(fErrors[0]*100/GetNumExecutions()) 
+          << "%) Evts survived Basic selections!" << endl;
     *fLog << endl;
 
@@ -325 +335 @@
 }
 
+

trunk/MagicSoft/Mars/manalysis/MSelBasic.h

@@ -30 +30 @@
     const MRawRunHeader *fRawRun;       
 
-          Int_t        fErrors[4];
+    Double_t     ThetaMin;
+    Double_t     ThetaMax;
+
+    Int_t        fErrors[4];
 
 public:

trunk/MagicSoft/Mars/manalysis/MSelStandard.cc

@@ -139 +139 @@
     Int_t fNumCorePixels   = fHil->GetNumCorePixels();
 
-    if ( fNumUsedPixels >= 92  ||  fNumCorePixels < 4 )
+    if ( fNumUsedPixels >= 92  ||  fNumCorePixels <= 4 )
     {
       //*fLog << "MSelStandard::Process; fSize, fDist, fNumUsedPixels, fNumCorePixels = "
@@ -147 +147 @@
     }    
 
-    else if ( fSize <= 60.0         ||  fDist< 0.4           ||  fDist > 1.1 )
+    else if ( fSize <= 60.0         ||  fDist< 0.4           ||  fDist > 1.05 )
     {
       //*fLog << "MSelStandard::Process; fSize, fDist, fNumUsedPixels, fNumCorePixels = "
@@ -180 +180 @@
     *fLog << GetDescriptor() << " execution statistics:" << endl;
     *fLog << dec << setfill(' ');
-    *fLog << " " << setw(7) << fErrors[1] << " (" << setw(3) << (int)(fErrors[1]*100/GetNumExecutions()) << "%) Evts skipped due to: Requirements on no.of used or core pxels not fullfilled" << endl;
-
-    *fLog << " " << setw(7) << fErrors[2] << " (" << setw(3) << (int)(fErrors[2]*100/GetNumExecutions()) << "%) Evts skipped due to: Requirements on SIZE or DIST not fullfilled" << endl;
-
-    *fLog << " " << setw(7) << fErrors[3] << " (" << setw(3) << (int)(fErrors[3]*100/GetNumExecutions()) << "%) Evts skipped due to: Length or Width is <= 0" << endl;
-
-    *fLog << " " << fErrors[0] << " (" << (int)(fErrors[0]*100/GetNumExecutions()) << "%) Evts survived Standard selections!" << endl;
+    *fLog << " " << setw(7) << fErrors[1] << " (" << setw(3) 
+          << (int)(fErrors[1]*100/GetNumExecutions()) 
+          << "%) Evts skipped due to: Requirements on no.of used or core pxels not fullfilled" << endl;
+
+    *fLog << " " << setw(7) << fErrors[2] << " (" << setw(3) 
+          << (int)(fErrors[2]*100/GetNumExecutions()) 
+          << "%) Evts skipped due to: Requirements on SIZE or DIST not fullfilled" << endl;
+
+    *fLog << " " << setw(7) << fErrors[3] << " (" << setw(3) 
+          << (int)(fErrors[3]*100/GetNumExecutions()) 
+          << "%) Evts skipped due to: Length or Width is <= 0" << endl;
+
+    *fLog << " " << fErrors[0] << " (" 
+          << (int)(fErrors[0]*100/GetNumExecutions()) 
+          << "%) Evts survived Standard selections!" << endl;
     *fLog << endl;