java/trunk/conditions/src/main/sql
--- java/trunk/conditions/src/main/sql/conditions_database_testrun_2012_full.sql 2014-04-11 18:52:50 UTC (rev 477)
+++ java/trunk/conditions/src/main/sql/conditions_database_testrun_2012_full.sql 2014-04-11 19:35:41 UTC (rev 478)
@@ -56,13 +56,13 @@
`valid_from` datetime DEFAULT NULL,
`valid_to` datetime DEFAULT NULL,
`created_by` varchar(255) DEFAULT NULL,
- `notes` blob,
+ `notes` longtext,
`name` varchar(40) NOT NULL,
`format_version` varchar(16) DEFAULT NULL,
`table_name` varchar(50) NOT NULL,
`collection_id` int(11) NOT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -71,7 +71,7 @@
LOCK TABLES `conditions_dev` WRITE;
/*!40000 ALTER TABLE `conditions_dev` DISABLE KEYS */;
-INSERT INTO `conditions_dev` VALUES (1,777,1365,'2013-09-30 23:05:51','2013-09-20 13:19:55',NULL,NULL,'jeremym',NULL,'svt_calibrations',NULL,'svt_calibrations',1),(2,777,1365,'2013-09-30 23:05:11','2013-09-24 16:48:39',NULL,NULL,'jeremym',NULL,'ecal_gains',NULL,'ecal_gains',1),(3,777,1365,'2013-09-30 23:05:11','2013-09-30 16:02:49',NULL,NULL,'jeremym',NULL,'ecal_bad_channels',NULL,'ecal_bad_channels',1),(4,777,1365,'2013-10-02 19:39:25','2013-09-30 17:25:21',NULL,NULL,'jeremym',NULL,'ecal_calibrations',NULL,'ecal_calibrations',1),(5,777,1365,'2013-10-02 19:39:25','2013-10-02 12:39:11',NULL,NULL,'jeremym',NULL,'svt_bad_channels',NULL,'svt_bad_channels',1),(6,777,1365,'2013-10-03 21:59:50','2013-10-03 14:59:33',NULL,NULL,'jeremym',NULL,'svt_pulse_parameters',NULL,'svt_pulse_parameters',1),(7,777,1365,'2013-10-10 23:02:42','2013-10-03 16:51:19',NULL,NULL,'jeremym',NULL,'svt_gains',NULL,'svt_gains',1),(8,777,1365,'2013-10-10 23:02:42','2013-!
10-10 16:02:27',NULL,NULL,'jeremym',NULL,'svt_daq[...]
+INSERT INTO `conditions_dev` VALUES (1,777,1365,'2013-09-30 23:05:51','2013-09-20 13:19:55',NULL,NULL,'jeremym',NULL,'svt_calibrations',NULL,'svt_calibrations',1),(2,777,1365,'2013-09-30 23:05:11','2013-09-24 16:48:39',NULL,NULL,'jeremym',NULL,'ecal_gains',NULL,'ecal_gains',1),(3,777,1365,'2013-09-30 23:05:11','2013-09-30 16:02:49',NULL,NULL,'jeremym',NULL,'ecal_bad_channels',NULL,'ecal_bad_channels',1),(4,777,1365,'2013-10-02 19:39:25','2013-09-30 17:25:21',NULL,NULL,'jeremym',NULL,'ecal_calibrations',NULL,'ecal_calibrations',1),(5,777,1365,'2013-10-02 19:39:25','2013-10-02 12:39:11',NULL,NULL,'jeremym',NULL,'svt_bad_channels',NULL,'svt_bad_channels',1),(6,777,1365,'2013-10-03 21:59:50','2013-10-03 14:59:33',NULL,NULL,'jeremym',NULL,'svt_pulse_parameters',NULL,'svt_pulse_parameters',1),(7,777,1365,'2013-10-10 23:02:42','2013-10-03 16:51:19',NULL,NULL,'jeremym',NULL,'svt_gains',NULL,'svt_gains',1),(8,777,1365,'2013-10-10 23:02:42','2013-10!
-10 16:02:27',NULL,NULL,'jeremym',NULL,'svt_daq[...]
/*!40000 ALTER TABLE `conditions_dev` ENABLE KEYS */;
UNLOCK TABLES;
@@ -184,51 +184,54 @@
UNLOCK TABLES;
--
--- Table structure for table `svt_bad_channels`
+-- Table structure for table `ecal_time_shifts`
--
-DROP TABLE IF EXISTS `svt_bad_channels`;
+DROP TABLE IF EXISTS `ecal_time_shifts`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `svt_bad_channels` (
+CREATE TABLE `ecal_time_shifts` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`collection_id` int(11) NOT NULL,
- `svt_channel_id` int(11) NOT NULL,
+ `ecal_channel_id` int(11) NOT NULL,
+ `time_shift` double NOT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3117 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=470 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Dumping data for table `svt_bad_channels`
+-- Dumping data for table `ecal_time_shifts`
--
-LOCK TABLES `svt_bad_channels` WRITE;
-/*!40000 ALTER TABLE `svt_bad_channels` DISABLE KEYS */;
-INSERT INTO `svt_bad_channels` VALUES (1,1,33),(2,1,129),(3,1,161),(4,1,257),(5,1,289),(6,1,385),(7,1,417),(8,1,545),(9,1,639),(10,1,673),(11,1,769),(12,1,801),(13,1,897),(14,1,929),(15,1,986),(16,1,1025),(17,1,1057),(18,1,1153),(19,1,1185),(20,1,1279),(21,1,1281),(22,1,1282),(23,1,1313),(24,1,1409),(25,1,1415),(26,1,1537),(27,1,1793),(28,1,1825),(29,1,1919),(30,1,1920),(31,1,1921),(32,1,2081),(33,1,2323),(34,1,2338),(35,1,2352),(36,1,2353),(37,1,2382),(38,1,2383),(39,1,2384),(40,1,2385),(41,1,2559),(42,1,2560),(43,1,2642),(44,1,3809),(45,1,5587),(46,1,5931),(47,1,7028),(48,1,7998),(49,1,7999),(50,1,8575),(51,2,2383),(52,2,3585),(53,2,3586),(54,2,3587),(55,2,3588),(56,2,3589),(57,2,3590),(58,2,3591),(59,2,3592),(60,2,3593),(61,2,3594),(62,2,3595),(63,2,3596),(64,2,3597),(65,2,3598),(66,2,3599),(67,2,3600),(68,2,3601),(69,2,3602),(70,2,3603),(71,2,3604),(72,2,3605),(73,2,3606),(74,2,3607),(75,2,3608),(76,2,3609),(77,2,3610),(78,2,3611),(79,2,3612),(80,2,3613),(81,2,3614),(82!
,2,3615),(83[...]
-/*!40000 ALTER TABLE `svt_bad_channels` ENABLE KEYS */;
+LOCK TABLES `ecal_time_shifts` WRITE;
+/*!40000 ALTER TABLE `ecal_time_shifts` DISABLE KEYS */;
+INSERT INTO `ecal_time_shifts` VALUES (1,1,1,0),(2,1,2,0),(3,1,3,0),(4,1,4,0),(5,1,5,0),(6,1,6,0),(7,1,7,0),(8,1,8,0),(9,1,9,0),(10,1,10,0),(11,1,11,0),(12,1,12,0),(13,1,13,0),(14,1,14,0),(15,1,15,0),(16,1,16,0),(17,1,17,0),(18,1,18,0),(19,1,19,0),(20,1,20,0),(21,1,21,0),(22,1,22,0),(23,1,23,0),(24,1,24,0),(25,1,25,0),(26,1,26,0),(27,1,27,0),(28,1,28,0),(29,1,29,0),(30,1,30,0),(31,1,31,0),(32,1,32,0),(33,1,33,0),(34,1,34,0),(35,1,35,0),(36,1,36,0),(37,1,37,0),(38,1,38,0),(39,1,39,0),(40,1,40,0),(41,1,41,0),(42,1,42,0),(43,1,43,0),(44,1,44,0),(45,1,45,0),(46,1,46,0),(47,1,47,0),(48,1,48,0),(49,1,49,0),(50,1,50,0),(51,1,51,0),(52,1,52,0),(53,1,53,0),(54,1,54,0),(55,1,55,0),(56,1,56,0),(57,1,57,0),(58,1,58,0),(59,1,59,0),(60,1,60,0),(61,1,61,0),(62,1,62,0),(63,1,63,0),(64,1,64,0),(65,1,65,0),(66,1,66,0),(67,1,67,0),(68,1,68,0),(69,1,69,0),(70,1,70,0),(71,1,71,0),(72,1,72,0),(73,1,73,0),(74,1,74,0),(75,1,75,0),(76,1,76,0),(77,1,77,0),(78,1,78,0),(79,1,79,0),(80,1,80,0),(81,1,81!
,0),(82,1,82[...]
+/*!40000 ALTER TABLE `ecal_time_shifts` ENABLE KEYS */;
UNLOCK TABLES;
--
--- Table structure for table `svt_bad_channels_scratch`
+-- Table structure for table `svt_bad_channels`
--
-DROP TABLE IF EXISTS `svt_bad_channels_scratch`;
+DROP TABLE IF EXISTS `svt_bad_channels`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `svt_bad_channels_scratch` (
- `channel` int(10) unsigned DEFAULT NULL,
- `fpga` int(10) unsigned DEFAULT NULL,
- `hybrid` int(10) unsigned DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `svt_bad_channels` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `collection_id` int(11) NOT NULL,
+ `svt_channel_id` int(11) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3117 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
--- Dumping data for table `svt_bad_channels_scratch`
+-- Dumping data for table `svt_bad_channels`
--
-LOCK TABLES `svt_bad_channels_scratch` WRITE;
-/*!40000 ALTER TABLE `svt_bad_channels_scratch` DISABLE KEYS */;
-/*!40000 ALTER TABLE `svt_bad_channels_scratch` ENABLE KEYS */;
+LOCK TABLES `svt_bad_channels` WRITE;
+/*!40000 ALTER TABLE `svt_bad_channels` DISABLE KEYS */;
+INSERT INTO `svt_bad_channels` VALUES (1,1,33),(2,1,129),(3,1,161),(4,1,257),(5,1,289),(6,1,385),(7,1,417),(8,1,545),(9,1,639),(10,1,673),(11,1,769),(12,1,801),(13,1,897),(14,1,929),(15,1,986),(16,1,1025),(17,1,1057),(18,1,1153),(19,1,1185),(20,1,1279),(21,1,1281),(22,1,1282),(23,1,1313),(24,1,1409),(25,1,1415),(26,1,1537),(27,1,1793),(28,1,1825),(29,1,1919),(30,1,1920),(31,1,1921),(32,1,2081),(33,1,2323),(34,1,2338),(35,1,2352),(36,1,2353),(37,1,2382),(38,1,2383),(39,1,2384),(40,1,2385),(41,1,2559),(42,1,2560),(43,1,2642),(44,1,3809),(45,1,5587),(46,1,5931),(47,1,7028),(48,1,7998),(49,1,7999),(50,1,8575),(51,2,2383),(52,2,3585),(53,2,3586),(54,2,3587),(55,2,3588),(56,2,3589),(57,2,3590),(58,2,3591),(59,2,3592),(60,2,3593),(61,2,3594),(62,2,3595),(63,2,3596),(64,2,3597),(65,2,3598),(66,2,3599),(67,2,3600),(68,2,3601),(69,2,3602),(70,2,3603),(71,2,3604),(72,2,3605),(73,2,3606),(74,2,3607),(75,2,3608),(76,2,3609),(77,2,3610),(78,2,3611),(79,2,3612),(80,2,3613),(81,2,3614),(82!
,2,3615),(83[...]
+/*!40000 ALTER TABLE `svt_bad_channels` ENABLE KEYS */;
UNLOCK TABLES;
--
@@ -406,4 +409,4 @@
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2014-03-19 16:58:10
+-- Dump completed on 2014-04-11 12:34:43
[Note: Some over-long lines of diff output only partialy shown]