--- DarthVader/CalorimeterLevel2/src/CaloProcessing.cpp	2007/01/11 09:32:54	1.9
+++ DarthVader/CalorimeterLevel2/src/CaloProcessing.cpp	2007/01/17 09:58:17	1.10
@@ -363,14 +363,29 @@
   Int_t val = 0;
   Int_t del = 1100;
   if ( clevel2->trigty != 2. ){
+    Bool_t ck = false;
     for (Int_t sec = 0; sec < 4; sec++){
       val = (Int_t)de->calselftrig[sec][6];
       del = delay(val);
       if ( del < 1100 ){
+	clevel2->wartrig = 0.;      
 	clevel2->trigty = 3.;
+	ck = true;
 	break;
       };
     };
+    if ( !ck ) clevel2->wartrig = 100.;      
+  } else {
+    Bool_t ck = false;
+    for (Int_t sec = 0; sec < 4; sec++){
+      val = (Int_t)de->calselftrig[sec][6];
+      del = delay(val);
+      if ( del < 1100 ){
+	clevel2->wartrig = 0.;      
+	ck = true;
+      };
+    };
+    if ( !ck ) clevel2->wartrig = 100.;      
   };
   //
   Int_t se = 5;
@@ -747,6 +762,9 @@
   } else {
     ca->selftrigger = 0;
   };
+  //
+  ca->selftrigger += (Int_t)clevel2->wartrig;
+  //
   memcpy(ca->perr,clevel2->perr,sizeof(clevel2->perr));
   memcpy(ca->swerr,clevel2->swerr,sizeof(clevel2->swerr));
   memcpy(ca->crc,clevel2->crc,sizeof(clevel2->crc));
@@ -829,6 +847,7 @@
 void CaloProcessing::ClearCommonVar(){
   istrip = 0;
   clevel2->trigty = -1.;
+  clevel2->wartrig = 0.;
   clevel2->good = 0;
   clevel2->nstrip = 0.;
   clevel2->qtot = 0.;