--- chewbacca/YodaProfiler/src/PamelaDBOperations.cpp	2009/01/13 13:38:15	1.23
+++ chewbacca/YodaProfiler/src/PamelaDBOperations.cpp	2009/11/25 09:39:50	1.26
@@ -427,7 +427,7 @@
       if ( IsDebug() ) printf(" Agh problems determining the orbit number! name = %s \n",name.Data());
       return;
     };
-    TString dwo = 0;
+    TString dwo = "";
     for (Int_t i = 0; i<5; i++){
       dwo.Append(name[i],1);
     };
@@ -857,7 +857,8 @@
   //  if ( nevent < jump ) jump = int(nevent/10);
   //  if ( !jump ) jump = 1;
   //
-  if ( (PKT(pktlast) < PKT(pktfirst) && OBT(obtlast) < OBT(obtfirst)) || (labs(PKT(pktlast)-PKT(pktfirst))<deltapkt && labs(OBT(obtlast)-OBT(obtfirst))<deltaobt) && nevent > deltapkt ){
+
+  if ( ((PKT(pktlast) < PKT(pktfirst) && OBT(obtlast) < OBT(obtfirst)) || (labs(PKT(pktlast)-PKT(pktfirst))<deltapkt && labs(OBT(obtlast)-OBT(obtfirst))<deltaobt)) && nevent > deltapkt ){
     //
     if ( IsDebug() ) printf(" starting jump %i \n",jump);
     //    if ( IsDebug() ) printf(" (PKT(pktlast) < PKT(pktfirst) && OBT(obtlast) > OBT(obtfirst)) %llu < %llu && %llu > %llu \n     OR \n     (PKT(pktlast) > PKT(pktfirst) && OBT(obtlast) < OBT(obtfirst)) %llu > %llu && %llu < %llu \n",PKT(pktlast),PKT(pktfirst),OBT(obtlast),OBT(obtfirst),PKT(pktlast),PKT(pktfirst),OBT(obtlast),OBT(obtfirst)); 
@@ -4235,6 +4236,7 @@
   UInt_t totime = 0;
   UInt_t obt = 0;
   UInt_t pkt = 0;
+  Float_t totped = 0.;
   //
   tr = (TTree*)file->Get("CalibCalPed");
   if ( !tr || tr->IsZombie() ) throw -21;
@@ -4252,6 +4254,18 @@
       if ( calibCalPed->cstwerr[section] ){
 	valid = 1;
 	if ( calibCalPed->cperror[section] ) valid = 0;
+	//
+	// check pedestal values for one plane, if all zeros calibration is not valid (calorimeter power problems) [8th data reduction bug, fixed on 25/11/2009 by E.M.]
+	//
+	totped = 0.;
+	for (UInt_t ss=0; ss<96; ss++){
+	  totped += calibCalPed->calped[section][0][ss];
+	}
+	if ( totped < 1. ){
+	  if ( IsDebug() ) printf(" Section %i totped %f -  No calibration data! Calorimeter power problems? \n",section,totped);
+	  valid = 0;
+	};
+	//
 	ph = eh->GetPscuHeader();
 	obt = ph->GetOrbitalTime();  
 	pkt = ph->GetCounter();  
@@ -4419,6 +4433,8 @@
   tr->SetBranchAddress("Header", &eh);
   nevents = tr->GetEntries();
   //
+  Float_t totpul = 0.;
+  //
   if ( nevents > 0 ){
     //
     for (UInt_t i=0; i < nevents; i++){
@@ -4428,6 +4444,18 @@
 	if ( cp1->pstwerr[section] && cp1->unpackError == 0 ){
 	  valid = 1;
 	  if ( cp1->pperror[section] ) valid = 0;
+	  //
+	  // check pulse values for one plane, if all zeros calibration is not valid (calorimeter power problems) [8th data reduction bug, fixed on 25/11/2009 by E.M.]
+	  //
+	  totpul = 0.;
+	  for (UInt_t ss=0; ss<96; ss++){
+	    totpul += cp1->calpuls[section][0][ss];
+	  }
+	  if ( totpul >= 3145632. ){
+	    if ( IsDebug() ) printf(" PULSE1 Section %i totpul %f -  No calibration data! Calorimeter power problems? \n",section,totpul);
+	    valid = 0;
+	  };
+	  //
 	  ph = eh->GetPscuHeader();
 	  obt = ph->GetOrbitalTime();  
 	  pkt = ph->GetCounter();  
@@ -4585,6 +4613,18 @@
 	if ( cp2->pstwerr[section] && cp2->unpackError == 0 ){
 	  valid = 1;
 	  if ( cp2->pperror[section] ) valid = 0;
+	  //
+	  // check pulse values for one plane, if all zeros calibration is not valid (calorimeter power problems) [8th data reduction bug, fixed on 25/11/2009 by E.M.]
+	  //
+	  totpul = 0.;
+	  for (UInt_t ss=0; ss<96; ss++){
+	    totpul += cp2->calpuls[section][0][ss];
+	  }
+	  if ( totpul >= 3145632. ){
+	    if ( IsDebug() ) printf(" PULSE2 Section %i totpul %f -  No calibration data! Calorimeter power problems? \n",section,totpul);
+	    valid = 0;
+	  };
+	  //
 	  ph = eh->GetPscuHeader();
 	  obt = ph->GetOrbitalTime();  
 	  pkt = ph->GetCounter();