--- DarthVader/CalorimeterLevel2/src/CaloProcessing.cpp	2006/11/22 08:31:11	1.8
+++ DarthVader/CalorimeterLevel2/src/CaloProcessing.cpp	2007/01/22 09:16:59	1.11
@@ -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;
@@ -578,8 +593,8 @@
 	  };
 	};
 	//
-	if ( ener0 == 0. && cbase0 == 0. && !pproblem ){
-	  if ( verbose ) printf(" Calorimeter power problems! event marked as bad \n");
+	if ( ener0 == 0. && cbase0 == 0. && !pproblem && clevel2->perr[se] == 0){
+	  if ( verbose ) printf(" Entry %i : calorimeter power problems! event marked as bad \n",ei);
 	  pproblem = true;
 	  pe++;
 	};
@@ -709,23 +724,31 @@
   t_ca->qlow = clevel2->qlow;
   t_ca->nlow = (Int_t)clevel2->nlow;
   //
-  memcpy(t_ca->tibar,clevel2->tibar,sizeof(clevel2->tibar));
-  memcpy(t_ca->tbar,clevel2->tbar,sizeof(clevel2->tbar));
-  //
   if ( trkseqno == -1 ){
-    ca->impx = clevel2->impx;
-    ca->impy = clevel2->impy;
-    ca->tanx = clevel2->tanx;
-    ca->tany = clevel2->tany;
+    //    ca->impx = clevel2->impx;
+    //    ca->impy = clevel2->impy;
+    ca->tanx[1] = clevel2->tanx;
+    ca->tany[1] = clevel2->tany;
     ca->elen = clevel2->elen;
     ca->selen = clevel2->selen;
-    memcpy(ca->cibar,clevel2->cibar,sizeof(clevel2->cibar));
-    memcpy(ca->cbar,clevel2->cbar,sizeof(clevel2->cbar));
+    //    memcpy(ca->cibar,clevel2->cibar,sizeof(clevel2->cibar));
+    //    memcpy(ca->cbar,clevel2->cbar,sizeof(clevel2->cbar));
+    memcpy(t_ca->tibar,clevel2->cibar,sizeof(clevel2->cibar));
+    memcpy(t_ca->tbar,clevel2->cbar,sizeof(clevel2->cbar));
     memcpy(ca->planemax,clevel2->planemax,sizeof(clevel2->planemax));
-    memcpy(ca->varcfit,clevel2->varcfit,sizeof(clevel2->varcfit));
-    memcpy(ca->npcfit,clevel2->npcfit,sizeof(clevel2->npcfit));
+    ca->varcfit[2] = clevel2->varcfit[0];
+    ca->varcfit[3] = clevel2->varcfit[1];
+    ca->npcfit[2] = clevel2->npcfit[0];
+    ca->npcfit[3] = clevel2->npcfit[1];    
+    //    memcpy(ca->varcfit,clevel2->varcfit,sizeof(clevel2->varcfit));
+    //    memcpy(ca->npcfit,clevel2->npcfit,sizeof(clevel2->npcfit));
+  } else {
+    memcpy(t_ca->tibar,clevel2->tibar,sizeof(clevel2->tibar));
+    memcpy(t_ca->tbar,clevel2->tbar,sizeof(clevel2->tbar));
   };
+  //
   // 
+  if ( !(ca->CaloTrk) ) ca->CaloTrk = new TClonesArray("CaloTrkVar",1); //ELENA
   TClonesArray &t = *ca->CaloTrk;
   new(t[nutrk]) CaloTrkVar(*t_ca);
   //
@@ -746,15 +769,18 @@
   } 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));
   ca->nstrip = (Int_t)clevel2->nstrip;
   ca->qtot = clevel2->qtot;
-  ca->impx = clevel2->impx;
-  ca->impy = clevel2->impy;
-  ca->tanx = clevel2->tanx;
-  ca->tany = clevel2->tany;
+  //  ca->impx = clevel2->impx;
+  //  ca->impy = clevel2->impy;
+  ca->tanx[0] = clevel2->tanx;
+  ca->tany[0] = clevel2->tany;
   ca->nx22 = (Int_t)clevel2->nx22;
   ca->qx22 = clevel2->qx22;
   ca->qmax = clevel2->qmax;
@@ -762,8 +788,14 @@
   ca->selen = clevel2->selen;
   memcpy(ca->qq,clevel2->qq,sizeof(clevel2->qq));
   memcpy(ca->planemax,clevel2->planemax,sizeof(clevel2->planemax));
-  memcpy(ca->varcfit,clevel2->varcfit,sizeof(clevel2->varcfit));
-  memcpy(ca->npcfit,clevel2->npcfit,sizeof(clevel2->npcfit));
+  ca->varcfit[0] = clevel2->varcfit[0];
+  ca->varcfit[1] = clevel2->varcfit[1];
+  ca->npcfit[0] = clevel2->npcfit[0];
+  ca->npcfit[1] = clevel2->npcfit[1]; 
+  ca->fitmode[0] = clevel2->fmode[0];
+  ca->fitmode[1] = clevel2->fmode[1];
+  //  memcpy(ca->varcfit,clevel2->varcfit,sizeof(clevel2->varcfit));
+  //  memcpy(ca->npcfit,clevel2->npcfit,sizeof(clevel2->npcfit));
   memcpy(ca->cibar,clevel2->cibar,sizeof(clevel2->cibar));
   memcpy(ca->cbar,clevel2->cbar,sizeof(clevel2->cbar));
   //
@@ -828,13 +860,14 @@
 void CaloProcessing::ClearCommonVar(){
   istrip = 0;
   clevel2->trigty = -1.;
+  clevel2->wartrig = 0.;
   clevel2->good = 0;
   clevel2->nstrip = 0.;
   clevel2->qtot = 0.;
-  clevel2->impx = 0.;
-  clevel2->impy = 0.;
-  clevel2->tanx = 0.;
-  clevel2->tany = 0.;
+  //  clevel2->impx = 0.;
+  //  clevel2->impy = 0.;
+  clevel2->tanx = 0.; // this is correct since it refers to the fortran structure
+  clevel2->tany = 0.; // this is correct since it refers to the fortran structure
   clevel2->qmax = 0.;
   clevel2->nx22 = 0.;
   clevel2->qx22 = 0.;
@@ -842,9 +875,10 @@
   memset(clevel2->swerr, 0, 4*sizeof(Int_t));
   memset(clevel2->crc, 0, 4*sizeof(Int_t));
   memset(clevel2->qq, 0, 4*sizeof(Int_t));
-  memset(clevel2->varcfit, 0, 2*sizeof(Float_t));
-  memset(clevel2->npcfit, 0, 2*sizeof(Int_t));
+  memset(clevel2->varcfit, 0, 4*sizeof(Float_t));
+  memset(clevel2->npcfit, 0, 4*sizeof(Int_t));
   memset(clevel2->planemax, 0, 2*sizeof(Int_t));
+  memset(clevel2->fmode, 0, 2*sizeof(Int_t));
   memset(clevel2->cibar, 0, 2*22*sizeof(Int_t));
   memset(clevel2->cbar, 0, 2*22*sizeof(Float_t));
 }