--- DarthVader/CalorimeterLevel2/src/CaloLevel2.cpp	2006/08/04 14:38:46	1.6
+++ DarthVader/CalorimeterLevel2/src/CaloLevel2.cpp	2006/11/09 17:05:44	1.7
@@ -12,6 +12,13 @@
  * CaloTrkVar constructor
 **/
 CaloTrkVar::CaloTrkVar() {
+  this->Clear();
+};
+
+/**
+ * Clear variables
+**/
+void CaloTrkVar::Clear() {
   trkseqno = 0;
   noint = 0;
   ncore = 0;
@@ -78,30 +85,10 @@
 CaloLevel2::CaloLevel2() {    
   //
   CaloTrk = new TClonesArray("CaloTrkVar",1);
-  //
-  nstrip = 0;
-  qtot = 0.;
-  impx = 0.;
-  impy = 0.;
-  tanx = 0.;
-  tany = 0.;
-  qmax = 0.;
-  nx22 = 0;
-  qx22 = 0.;
-  elen = 0.;
-  selen = 0.;
-  memset(perr, 0, 4*sizeof(Int_t));
-  memset(swerr, 0, 4*sizeof(Int_t));
-  memset(crc, 0, 4*sizeof(Int_t));
-  memset(qq, 0, 4*sizeof(Int_t));
-  memset(varcfit, 0, 2*sizeof(Float_t));
-  memset(npcfit, 0, 2*sizeof(Int_t));
-  memset(planemax, 0, 2*sizeof(Int_t));
-  memset(cibar, 0, 2*22*sizeof(Int_t));
-  memset(cbar, 0, 2*22*sizeof(Float_t));
-  good = 0;
-  selftrigger = 0;
   estrip = TArrayF(0,NULL);
+  //
+  this->Clear();
+  //
 };
 
 void CaloLevel2::Clear() {