Changeset 377 for trunk/MagicSoft/Simulation/Detector/TimeCam/timecam.cxx

Timestamp:

03/20/00 13:33:59 (25 years ago)

Author:

harald

Message:

Due to some conflicts on merge this is the new version.

File:

• trunk/MagicSoft/Simulation/Detector/TimeCam/timecam.cxx (modified) (16 diffs)

trunk/MagicSoft/Simulation/Detector/TimeCam/timecam.cxx

@@ -21 +21 @@
 //
 // $RCSfile: timecam.cxx,v $
-// $Revision: 1.4 $
+// $Revision: 1.5 $
 // $Author: harald $ 
-// $Date: 2000-03-20 08:25:17 $
+// $Date: 2000-03-20 13:33:59 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -57 +57 @@
 
 #include "MTrigger.hxx"
+#include "MFadc.hxx"
 
 #include "MRawEvt.h"
@@ -131 +132 @@
 #define __ROOT__
 
-// flag for INTERAKTIV  (default: OFF )
-#define __INTERAKTIV__
-#undef  __INTERAKTIV__
+// flag for MTRIGGER_SCAN  (default: OFF )
+#undef  __MTRIGGER_SCAN__
+#define __MTRIGGER_SCAN__
+
+// flag for MTRIGGER_SCAN  (default: OFF )
+#define __MFADC_SCAN__
+#undef  __MFADC_SCAN__
+
 //!@}
 
@@ -676 +682 @@
   MMcTrig *McTrig   = new MMcTrig() ; 
 
-
-  //  MFadc fadc ; 
+  MFadc fadc ; 
 
 #endif // __DETAIL_TRIGGER__ 
@@ -730 +735 @@
 #endif // __NSB__
 
-#ifdef __INTERAKTIV__
+#ifdef __MTRIGGER_SCAN__
   TApplication theApp("App", &argc, argv);
 
@@ -737 +742 @@
     //    return 1;
   }
-#endif // __INTERAKTIV__
+#endif // __MTRIGGER_SCAN__
+
+#ifdef __MFADC_SCAN__
+  TApplication theApp("App", &argc, argv);
+
+  if (gROOT->IsBatch()) {
+    fprintf(stderr, "%s: cannot run in batch mode\n", argv[0]);
+    //    return 1;
+  }
+#endif // __MFADC_SCAN__
   
 
@@ -843 +857 @@
   fnpixclean = new float [ ct_NPixels ];
 
-#ifdef __ROOT__
-  
-  // construct MFADC
-
-#endif // __ROOT__ 
-
-  
   //  moments_ptr = moments( anaPixels, NULL, NULL, 0.0, 1 );
         
@@ -1034 +1041 @@
         }
 
-#ifdef __ROOT__ 
-        // clear the MFADC 
-          
-#endif // __ROOT__ 
-
         ntcph_in +=ncph_in;
         ncph_in = 0;
@@ -1050 +1052 @@
         //   clear Trigger 
         //
-      
-        Trigger.Reset() ; 
+        Trigger.Reset() ; 
+
 #endif // __DETAIL_TRIGGER__ 
 
-        //  fadc.Reset() ; 
+        fadc.Reset() ; 
 
         //
@@ -1186 +1188 @@
           // cout << "@#1 " << nshow << ' ' << cx << ' ' << cy << endl;
           
-          nPMT = -1;
-
-          for(i=0; i<ct_NPixels; i++){
-            if( bpoint_is_in_pix( cx, cy, i, &cam) ){
-              nPMT = i;
-              break;
+          if ( (nPMT < 0) || (nPMT >= ct_NCentralPixels) ) {
+
+            // check the outer pixels
+            nPMT = -1;
+
+
+            for(i=ct_NCentralPixels; i<ct_NPixels; i++){
+              if( bpoint_is_in_pix( cx, cy, i, &cam) ){
+                nPMT = i;
+                break;
+              }
             }
           }
@@ -1260 +1267 @@
           //
           //
+
           Trigger.FillShow( nPMT, ( t - t_first ) ) ; 
 
-          // fadc.Fill( nPMT, ( t - t_first ), Trigger.Fill( nPMT, ( t - t_first ) ) ) ; 
+          fadc.Fill( nPMT, ( t - t_first ), Trigger.FillShow( nPMT, ( t - t_first ) ) ) ; 
 
 #endif // __DETAIL_TRIGGER__ 
@@ -1402 +1410 @@
         //   
         Trigger.ElecNoise() ;
+        fadc.ElecNoise() ;
         
 
@@ -1416 +1425 @@
 
         McTrig->SetZeroLevel( Lev0 = (Short_t) Trigger.ZeroLevel() ) ; 
-        
-        
-        
+
         Lev1 = Lev2 = 0 ; 
         
@@ -1426 +1433 @@
         
         if ( Lev0 > 0 ) {
-
           McTrig->SetFirstLevel ( Lev1 = Trigger.FirstLevel() )  ;
         }
@@ -1470 +1476 @@
         //       2. start the gui tool
 
-        if ( Lev1 > 0 ) {
-
-          // fadc.Scan( Trigger.GetFirstLevelTime(0) )  ; 
-
-#ifdef __INTERAKTIV__ 
+#ifdef __MFADC_SCAN__
+        if ( Lev0 > 0 ) {
+          cout << " huschel " << endl ; 
+          //      fadc.Scan()  ; 
+
+          fadc.ShowSignal( McEvt, (Float_t) 60. ) ; 
+        }
+#endif
+
+#ifdef __MTRIGGER_SCAN__
+
+        if ( Lev0 > 0 ) {
           Trigger.ShowSignal(McEvt) ;
+        }
 #endif
-        }
-        
+
 
 
@@ -2602 +2615 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.4  2000/03/20 08:25:17  harald
+// Some changes in the timecam.cxx to run with the updated functions of the
+// class MTrigger.
+//
 // Revision 1.3  2000/02/16 12:50:12  harald
 // At the meeting in Barcelona Dirk preseted an error in the pixelization