Changeset 436 for trunk/MagicSoft/include-Classes

Timestamp:

09/22/00 18:40:18 (24 years ago)

Author:

harald

Message:

Added a lot of changes done by oscar.

Location:

trunk/MagicSoft/include-Classes

Files:

• LinkDef.h (modified) (1 diff)
• MHeaderTrig.cxx (added)
• MHeaderTrig.hxx (added)
• MMcTrig.cxx (modified) (3 diffs)
• MMcTrig.hxx (modified) (4 diffs)

trunk/MagicSoft/include-Classes/LinkDef.h

@@ -10 +10 @@
 #pragma link C++ class MMcEvt;
 #pragma link C++ class MMcTrig;
+#pragma link C++ class MHeaderTrig;
 
 #pragma link C++ class MPedData;

trunk/MagicSoft/include-Classes/MMcTrig.cxx

@@ -23 +23 @@
   Int_t i;
 
-  topology     = -1 ;
-  multiplicity = -1 ;
-  for(i=0;i<TRIGGER_PIXELS;i++){
-    threshold[i] = -1.0;
+  nFirstLevel  = 0 ;
+
+  for(i=0;i<TOTAL_TRIGGER_TIME/LEVEL1_DEAD_TIME+1;i++){
+    timeFirst[i]    = -99.9;
+    pixelFirst[i]   = -9;
   }
 
-  nFirstLevel  = 0 ;
-  timeFirst    = -99.9;
-  pixelFirst   = -9;
-   
   nSecondLevel = 0 ; 
-
+  for(i=0;i<TOTAL_TRIGGER_TIME/LEVEL2_DEAD_TIME+1;i++){
+    FirstToSecond[i]=0;
+  }
 }
 
@@ -50 +49 @@
 
   nFirstLevel  = 0 ;
-  timeFirst    = -99.9;
-  pixelFirst   = -9;
+  for(i=0;i<TOTAL_TRIGGER_TIME/LEVEL1_DEAD_TIME+1;i++){
+    timeFirst[i]    = -99.9;
+    pixelFirst[i]   = -9;
+  }
 
-  nSecondLevel = 0 ;
+  nSecondLevel = 0 ; 
+  for(i=0;i<TOTAL_TRIGGER_TIME/LEVEL2_DEAD_TIME+1;i++){
+    FirstToSecond[i]=0;
+  }
 
   //  cout << "MMcTrig::Clear() " << endl ; 
@@ -65 +69 @@
 
   cout <<endl << "Monte Carlo Trigger output:" <<endl;
-  cout << " Topology Trigger in this event : "<<topology<<endl;
-  cout << " Multiplicity Trigger in this event : "<<multiplicity<<endl;
   cout << " First  Level Trigger in this Event : "<<nFirstLevel<<endl; 
-  cout << " Time of first  Level Trigger in this Event : "<< timeFirst<<endl;
-  cout << " Pixels of first  Level Trigger in this Event : "<<pixelFirst<<endl;
+  cout << " Times of first  Level Trigger in this Event : ";
+  for (i=0;i<nFirstLevel;i++){
+    cout<< timeFirst[i]<<"-";
+  }
+  cout<<endl;
+  cout << " Pixels of first  Level Trigger in this Event : ";
+  for (i=0;i<nFirstLevel;i++){
+    cout<<pixelFirst[i]<<"-";
+  }
+  cout<<endl;
   cout << " Second Level Trigger in this Event : " << nSecondLevel << endl ; 
   cout << endl ; 

trunk/MagicSoft/include-Classes/MMcTrig.hxx

@@ -15 +15 @@
 class MMcTrig : public TObject {
  private:
-  Short_t topology     ;    // Topology of the trigger
-                                   // 0 = N-1 neighbours of one pixel
-                                   // 1 = N neighbours
-                                   // 2 = N closed pack
-  Short_t multiplicity ;    // Pixel multiplicity of trigger configuration
-  Float_t threshold[TRIGGER_PIXELS] ; // Threshold for trigger
-  
-  Short_t nZeroLevel   ;
+
   Short_t nFirstLevel  ;    // Number of First Level Trigger in this Event
   Short_t nSecondLevel ;    // Number of Second Level Trigger in this Event
 
-  Float_t timeFirst;    // Time when it triggers
-  Int_t pixelFirst;     // Pixel which triggers
+  Float_t timeFirst[((Int_t)(TOTAL_TRIGGER_TIME/LEVEL1_DEAD_TIME))+1];
+                            // Time when it triggers
+  Int_t pixelFirst[((Int_t)(TOTAL_TRIGGER_TIME/LEVEL1_DEAD_TIME))+1];
+                            // Pixel which triggers
+  Short_t FirstToSecond[((Int_t)(TOTAL_TRIGGER_TIME/LEVEL2_DEAD_TIME))+1];
 
  public:
@@ -38 +34 @@
   void Print(Option_t *);
 
-  void SetTopology(Short_t nTop) {
-    topology=nTop;
-  }
-
-  void SetMultiplicity(Short_t nMul) {
-    multiplicity=nMul;
-  }
-
-  void SetThreshold(Float_t fthr[]){
-    int i;
-    for(i=0;i<TRIGGER_PIXELS;i++){
-      threshold[i]=fthr[i];
-    }
-  }
-
-  void SetZeroLevel (Short_t nTr) {
-    nZeroLevel = nTr ; 
-  }
-
   void SetFirstLevel  ( Short_t nTr ) {
     nFirstLevel = nTr ; 
@@ -64 +41 @@
   } 
 
-  void SetTime( Float_t t){
-    timeFirst=t;
+  void SetTime( Float_t t, Int_t i){
+    if (i>TOTAL_TRIGGER_TIME/LEVEL1_DEAD_TIME+1  || i<1){
+      cout<<"nFirstLevel out of range. Time will be -99"<<endl;
+    }
+    else{
+      timeFirst[i-1]=t;
+    }
   }
 
-  void SetPixel( Int_t iPix){
-    pixelFirst=iPix;
+  void SetPixel( Int_t iPix, Int_t i){
+    if (i>TOTAL_TRIGGER_TIME/LEVEL1_DEAD_TIME+1  || i<1){
+      cout<<"nFirstLevel out of range. Pixel will be -1"<<endl;
+    }
+    else{
+      pixelFirst[i-1]=iPix;
+    }
   }
 
-  int GetFirstLevel() {
+  Int_t GetFirstLevel() {
     return ( nFirstLevel );  
   }
@@ -81 +68 @@
 
 #endif
-