Changeset 2314 for trunk/MagicSoft/Mars

Timestamp:

08/22/03 12:30:02 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mhistmc/MHMcCT1CollectionArea.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/08/22: Wolfgang Wittek
+
+    * mhistmc/MHMcCT1CollectionArea.cc
+      - change selection of theta bin in 'CalcEfficiency()'
+        (to be mored flexible in choosing the theta binnning)
+
+
+
 
  2003/08/21: Thomas Bretz
@@ -46 +55 @@
      In the loop where fDataRang is set, the local variable v must 
      be used with indices n1 and n2.   
+
 
 

trunk/MagicSoft/Mars/mhistmc/MHMcCT1CollectionArea.cc

@@ -282 +282 @@
 
       Float_t theta = fHistAll->GetYaxis()->GetBinCenter(thetabin);
+      Float_t thetalo = fHistAll->GetYaxis()->GetBinLowEdge(thetabin);
+      Float_t thetahi = fHistAll->GetYaxis()->GetBinLowEdge(thetabin+1);
 
       Float_t emin[4];       // Minimum energy in MC sample
@@ -311 +313 @@
       Int_t num_MC_samples = 0;
 
-      if (theta > 8 && theta < 9)   // 8.75 deg
+      //if (theta > 8 && theta < 9)   // 8.75 deg
+      if (  thetalo<8.75  && 8.75<thetahi)   // 8.75 deg
         {
           emin[0] = 300.;
@@ -326 +329 @@
           num_MC_samples = 2;
         }
-      else if (theta > 20 && theta < 21)  // 20.5 deg 
+      //else if (theta > 20 && theta < 21)  // 20.5 deg 
+      else if (  thetalo<20.5  && 20.5<thetahi)   // 20.5 deg
         {
           emin[0] = 300.;
@@ -341 +345 @@
           num_MC_samples = 2;
         }
-      else if (theta > 26 && theta < 27)  // 26.5 degrees
+      //else if (theta > 26 && theta < 27)  // 26.5 degrees
+      else if (  thetalo<26.5  && 26.5<thetahi)   // 26.5 deg
         {
           emin[0] = 300.;
@@ -356 +361 @@
           num_MC_samples = 2;
         }
-      else if (theta > 32 && theta < 33)  // 32.5 degrees
+      //else if (theta > 32 && theta < 33)  // 32.5 degrees
+      else if (  thetalo<32.5  && 32.5<thetahi)   // 32.5 deg
         {
           emin[0] = 300.;
@@ -366 +372 @@
           num_MC_samples = 1;
         }
-      else if (theta > 38 && theta < 39)  // 38.75 degrees
+      //else if (theta > 38 && theta < 39)  // 38.75 degrees
+      else if (  thetalo<38.75  && 38.75<thetahi)   // 38.75 deg
         {
           emin[0] = 300.;
@@ -376 +383 @@
           num_MC_samples = 1;
         }
-      else if (theta > 45 && theta < 47)  // 46 degrees
+      //else if (theta > 45 && theta < 47)  // 46 degrees
+      else if (  thetalo<46  && 46<thetahi)   // 46 deg
         {
           emin[0] = 300.;
@@ -386 +394 @@
           num_MC_samples = 1;
         }
-      else if (theta > 54 && theta < 56)  // 55 degrees
+      //else if (theta > 54 && theta < 56)  // 55 degrees
+      else if (  thetalo<55  && 55<thetahi)   // 55 deg
         {
           //
@@ -417 +426 @@
         }
 
-      else if (theta > 64 && theta < 66)  // 65 degrees
+      //else if (theta > 64 && theta < 66)  // 65 degrees
+      else if (  thetalo<65  && 65<thetahi)   // 65 deg
         {
           emin[0] = 2000.;